Merge commit '8815f03202abf3117b6a1f6a058a835915ddae04' into gingerbread-plus-aosp
* commit '8815f03202abf3117b6a1f6a058a835915ddae04':
Always set right auth_type value in apn.
Merge commit '873a27c399a50cb2a4703cc895c1601124ae208d' into gingerbread-plus-aosp
* commit '873a27c399a50cb2a4703cc895c1601124ae208d':
Import revised translations. DO NOT MERGE
It fixes a bug that automatically sets auth_type value
of editing apn that has and should have that value set
to null (-1 = Not yet set) to auth_type value of an
apn previously displayed in the apn editor. It is
caused by careless persisting and reading data from
SharedPreferences. Fixed to keep and persist (to be
consistent with other apn's Preferences) null value
for not yet set auth_type property.
Change-Id: I4e125a4cdbad968c9f6ea8781a8c849f4c31c929
Merge commit 'a640fb4f97ee5e317ed51bd585c892d465b3da38' into gingerbread-plus-aosp
* commit 'a640fb4f97ee5e317ed51bd585c892d465b3da38':
Fix the build. A "--" token is not just text in an XML comment.
Merge commit '69827524365ae448d19b2089c46534e925cc2bfd' into gingerbread-plus-aosp
* commit '69827524365ae448d19b2089c46534e925cc2bfd':
Try to fix bug3119318 without breaking the build this time
Merge commit 'af06d7a94a69d82ef5f2d8082e75c368f4204afb' into gingerbread-plus-aosp
* commit 'af06d7a94a69d82ef5f2d8082e75c368f4204afb':
Fix bug3119318, missing Mount USB storage strings
NFC service now tracks its own settings. Call the NFC API to determine
state.
Change-Id: Ibdb33e68abdbe36df31fb13ad95c8ca1b3bcb35b
Signed-off-by: Nick Pelly <npelly@google.com>
Also fixes issue #3097388: If you launch Manage Applications when SD
card app info isn't available, incomplete information gets cached
Change-Id: If3377a965653590e5bc1df25e38764a83e96b820
Merge commit 'dd49624ed049d6f2f9946f71381bcde83f19e5e0' into gingerbread-plus-aosp
* commit 'dd49624ed049d6f2f9946f71381bcde83f19e5e0':
Del "erase" from new unmount setting subtext
Merge commit '8abc40bb11690125fa441775041e0a64c79acc43' into gingerbread-plus-aosp
* commit '8abc40bb11690125fa441775041e0a64c79acc43':
Correct some typos, impose more consistency.
3094621: add "wipe sd card" option to factory data reset
3094609: collapse unmount/format into one command
Implements requested UI changes. Also some final tweaks to
Manage Applications.
Change-Id: I0219195dd0c74d8c003ef1c3f6e09714859d7f89
Merge commit '3594b1b73d022d5815bcdef78e6143cfd63ee354' into gingerbread-plus-aosp
* commit '3594b1b73d022d5815bcdef78e6143cfd63ee354':
Import revised translations DO NOT MERGE
Merge commit 'e1a9ca686249ebe7c85a98d467bb705e4c3eed2f' into gingerbread-plus-aosp
* commit 'e1a9ca686249ebe7c85a98d467bb705e4c3eed2f':
Use NfcAdapter.getDefaultAdapter() to check for NFC prescence.
Merge commit '1bdb7874adf52b0fc2fe6ec40913a0562cf585ed' into gingerbread-plus-aosp
* commit '1bdb7874adf52b0fc2fe6ec40913a0562cf585ed':
Make summary appear for both checked and unchecked NFC checkbox in Settings.
Merge commit '2c4899737be92b858a9e2d9d743709cae310149b' into gingerbread-plus-aosp
* commit '2c4899737be92b858a9e2d9d743709cae310149b':
Change USB tab to USB storage if it fits
