• Home
  • History
  • Annotate
  • only in /packages/apps/CertInstaller/
History log of /packages/apps/CertInstaller/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
bb716492f4a76cec57f9793fb719b1823cca21de 20-Aug-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: Iabc735f48a6f6298b0a570788c637b688e4e6207
Auto-generated-cl: translation import
es/values-hy-rAM/strings.xml
e93ff75889c973f64bc7493fceed6b5735114cc7 21-Jul-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: Ie46ac57ca10d9d92af5168884e5fb2038a17db91
Auto-generated-cl: translation import
es/values-be-rBY/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-eu-rES/strings.xml
es/values-my-rMM/strings.xml
701ddfd2b91b15873d6ff39218718ac08558b3c6 16-Jun-2016 Rubin Xu <rubinxu@google.com> Skip non KeyEntry from PKCS12 file during extraction.
am: 89703ddeb0

Change-Id: I818dfc7242e1042991e56c1bd0cb34d157f1682d
89703ddeb050ce3f7163948574e1152fbd949ff7 14-Jun-2016 Rubin Xu <rubinxu@google.com> Skip non KeyEntry from PKCS12 file during extraction.

Change-Id: I76880fc3a39c092cfc007450f59c477a2bdaf48e
Fix: 29315994
rc/com/android/certinstaller/CredentialHelper.java
7fa8cea599a15df2bb0a3c361e6fed048979f47e 08-Jun-2016 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE
am: e1ab94c0a5 -s ours

Change-Id: I5b7fa71dc3da6af9e2c9e235c40c5d8b0645bb7a
e1ab94c0a5d45b6016127ac9edf53bfcb39b6dd2 08-Jun-2016 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 29169863
Change-Id: Id451071d48faec8169bff7a858563b4a8cf876ae
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-eu-rES/strings.xml
14235840f67ef844d926d71dc2448e1c7cd266c0 03-Jun-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE
am: 415cbec3aa -s ours

* commit '415cbec3aa6880c37398bfa41d1deb35f5b700d9':
Import translations. DO NOT MERGE

Change-Id: I810eb575a15c53d65f6ab63765e8213f8a12ceb0
f9fe5f20cd018697502c337a5057929b4ea819e0 03-Jun-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: Ica05b86321d8d7a556e6a646f156b455a96caa2c
Auto-generated-cl: translation import
es/values-bn-rBD/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-gu-rIN/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-kn-rIN/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-ml-rIN/strings.xml
es/values-my-rMM/strings.xml
es/values-ne-rNP/strings.xml
es/values-pa-rIN/strings.xml
es/values-sw/strings.xml
es/values-tl/strings.xml
415cbec3aa6880c37398bfa41d1deb35f5b700d9 03-Jun-2016 Bill Yi <byi@google.com> Import translations. DO NOT MERGE

Change-Id: Id3867cfe24d042af1d0c1b5ea1b5d03ef094ffc1
Auto-generated-cl: translation import
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-kn-rIN/strings.xml
es/values-lt/strings.xml
es/values-my-rMM/strings.xml
es/values-ne-rNP/strings.xml
es/values-pa-rIN/strings.xml
03689f54757c33ba3da38f80b6cb55c6282e76de 23-May-2016 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE
am: 85f7adad37 -s ours

* commit '85f7adad377c3a0fcf3ec5753a6305597c1edfe0':
Import translations. DO NOT MERGE

Change-Id: I91df25091e280a967f4f89723410ba2df594b323
85f7adad377c3a0fcf3ec5753a6305597c1edfe0 22-May-2016 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 28857042
Change-Id: Ibc3e786c697f659ceb3e888f4aa4cce75fee18a8
es/values-be-rBY/strings.xml
es/values-bn-rBD/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-gu-rIN/strings.xml
es/values-ka-rGE/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-my-rMM/strings.xml
es/values-pa-rIN/strings.xml
es/values-sw/strings.xml
es/values-tl/strings.xml
b33f2fc9e13c8e220d80486630be9665d8b7f91a 04-May-2016 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE
am: fc4c1b1b3e -s ours

* commit 'fc4c1b1b3e0ffbbe2abadf12d10a42ad58ea4452':
Import translations. DO NOT MERGE

Change-Id: I6302a0247340cb3ef93cae736ff5eed2cda7c86f
fc4c1b1b3e0ffbbe2abadf12d10a42ad58ea4452 04-May-2016 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 28463229
Change-Id: Id360b25e346da5eee258ace928f653cebc747fed
es/values-ml-rIN/strings.xml
9fb928566f5fa5e0d4a9e9af007696e9aeae5531 22-Apr-2016 Victor Chang <vichang@google.com> Approve CA certs automatically in CertInstaller
am: 38856d6bd1

* commit '38856d6bd1acc648b18aceb9af4d68e25f314fb6':
Approve CA certs automatically in CertInstaller

Change-Id: I8a05a280abdcb4de66fd3ae2738fa26c3bb4e1ff
38856d6bd1acc648b18aceb9af4d68e25f314fb6 13-Apr-2016 Victor Chang <vichang@google.com> Approve CA certs automatically in CertInstaller

- Since the cert is installed by real user, the cert is approved by the user
- It avoids cert pending approval notification posted by DPM
- Also, show screenlock only it has ca certs

Test:
- if no screenlock, it doesn't ask user to unlock. User will be asked to set a screenlock after naming the cert
- work chanllenge is shown if the cert is installed from work profile

Bug: 28161447

Change-Id: I3eea305fc6d8023f7a30a1644b7b0c2a873a3b75
ndroid.mk
ndroidManifest.xml
rc/com/android/certinstaller/CertInstaller.java
rc/com/android/certinstaller/CredentialHelper.java
rc/com/android/certinstaller/Util.java
5e8156f9c9ed774b570154b0bb61a9e543ba8c3d 23-Mar-2016 Rubin Xu <rubinxu@google.com> When installing client cert, do not add CA certs to trusted credentials

Bug: 18239590
Change-Id: I10b056c3bb86fdc371e92f0b2313425f9d1e125f
rc/com/android/certinstaller/CertInstaller.java
rc/com/android/certinstaller/CredentialHelper.java
55e502076150f9ccde2af7e2c5e0ad4468b10c26 21-Mar-2016 Aga Wronska <agawronska@google.com> Add back DocumentsContract.EXTRA_SHOW_ADVANCED flag, because it was
brought back to DocuemtnsUI

Revert "Fix build break from removal of DocumentsContract.EXTRA_SHOW_ADVANCED"

This reverts commit d31bf9e911fd006736ce74b870d0cad4896ff5f9.

Bug: 27683276
Change-Id: I92c631461f0201552d2df39e3347af9b2b6b3d71
rc/com/android/certinstaller/CertInstallerMain.java
60dc12ad304ae313eaaf1ee0e097b330ddb6e95c 19-Mar-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ied04892b84f91d2799c6af80e1b248d3bcf1d992
Auto-generated-cl: translation import
es/values-be-rBY/strings.xml
1cfd4a00b6caffcddf94c1c8e07ec1fe726c636e 02-Mar-2016 George Mount <mount@google.com> Fix build break from removal of DocumentsContract.EXTRA_SHOW_ADVANCED

Change-Id: Ibd4b5e5f01042c3b126499f98020606327faa10d
rc/com/android/certinstaller/CertInstallerMain.java
d653d6f1bafdb41542b1cb59d5b3ddd4ff56435c 29-Feb-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I77363edadc1b9c4646b65d38d99e165c034c975c
Auto-generated-cl: translation import
es/values-bs-rBA/strings.xml
es/values-el/strings.xml
es/values-ro/strings.xml
f2feec7b941f0663e29fce60ec39241e2af1931a 25-Feb-2016 Robin Lee <rgl@google.com> Merge "Remove unused string: storage_error" into nyc-dev
0ac64f8d62a73d38ea8bcb5f684aba7021d6a00c 23-Feb-2016 Robin Lee <rgl@google.com> resolve merge conflicts of ef177fb06e to cw-e-dev am: 7e2d30d880
am: 366e5932c9 -s ours

* commit '366e5932c97aea65a147d55370eb94776be1fa56':
Trust CA certificates added for the whole OS only
366e5932c97aea65a147d55370eb94776be1fa56 23-Feb-2016 Robin Lee <rgl@google.com> resolve merge conflicts of ef177fb06e to cw-e-dev
am: 7e2d30d880

* commit '7e2d30d880bdc751ee84a7782745f82911089374':
Trust CA certificates added for the whole OS only
a8a8b92b3d02334adfdfd86b27a7a27fbbb3466e 23-Feb-2016 Robin Lee <rgl@google.com> Remove unused string: storage_error

Bug: 27045170
Change-Id: I7a653106d09669399ddf944aba854f7f373a98e3
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-b+sr+Latn/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rBR/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
es/values/strings.xml
7e2d30d880bdc751ee84a7782745f82911089374 23-Feb-2016 Robin Lee <rgl@google.com> resolve merge conflicts of ef177fb06e to cw-e-dev

Change-Id: I936db87e2373aa40a0e7dd61fb8bce8448a0f25e
ef177fb06ebd33165dee4ce20ae73307f8b95441 23-Feb-2016 Robin Lee <rgl@google.com> Trust CA certificates added for the whole OS only am: 4f135c9bd7 am: 63176f4144 am: fb82066502 am: 92b51d2e67 am: 1e39462d6f am: 3048960121 am: 021a55abd2 am: 00efcbac54
am: b8ed5ed218

* commit 'b8ed5ed218a54afade3d2431e73899a1a6bd2215':
Trust CA certificates added for the whole OS only
b8ed5ed218a54afade3d2431e73899a1a6bd2215 23-Feb-2016 Robin Lee <rgl@google.com> Trust CA certificates added for the whole OS only am: 4f135c9bd7 am: 63176f4144 am: fb82066502 am: 92b51d2e67 am: 1e39462d6f am: 3048960121 am: 021a55abd2
am: 00efcbac54

* commit '00efcbac543be111c1cf756c2d62bc4b88f654b0':
Trust CA certificates added for the whole OS only
00efcbac543be111c1cf756c2d62bc4b88f654b0 23-Feb-2016 Robin Lee <rgl@google.com> Trust CA certificates added for the whole OS only am: 4f135c9bd7 am: 63176f4144 am: fb82066502 am: 92b51d2e67 am: 1e39462d6f am: 3048960121
am: 021a55abd2

* commit '021a55abd2f3e6e7c3d24e13027fb6638192cd92':
Trust CA certificates added for the whole OS only
021a55abd2f3e6e7c3d24e13027fb6638192cd92 23-Feb-2016 Robin Lee <rgl@google.com> Trust CA certificates added for the whole OS only am: 4f135c9bd7 am: 63176f4144 am: fb82066502 am: 92b51d2e67 am: 1e39462d6f
am: 3048960121

* commit '30489601214d02e43641ab35a955c114a703dee4':
Trust CA certificates added for the whole OS only
30489601214d02e43641ab35a955c114a703dee4 23-Feb-2016 Robin Lee <rgl@google.com> Trust CA certificates added for the whole OS only am: 4f135c9bd7 am: 63176f4144 am: fb82066502 am: 92b51d2e67
am: 1e39462d6f

* commit '1e39462d6f9dccd57aff18040ae9e5f31e7aa081':
Trust CA certificates added for the whole OS only
1e39462d6f9dccd57aff18040ae9e5f31e7aa081 23-Feb-2016 Robin Lee <rgl@google.com> Trust CA certificates added for the whole OS only am: 4f135c9bd7 am: 63176f4144 am: fb82066502
am: 92b51d2e67

* commit '92b51d2e67aaa8ea1f8074d53da15d2a90b02179':
Trust CA certificates added for the whole OS only
92b51d2e67aaa8ea1f8074d53da15d2a90b02179 23-Feb-2016 Robin Lee <rgl@google.com> Trust CA certificates added for the whole OS only am: 4f135c9bd7 am: 63176f4144
am: fb82066502

* commit 'fb820665021336ccf570cbdcdcda7df2a7cc7824':
Trust CA certificates added for the whole OS only
fb820665021336ccf570cbdcdcda7df2a7cc7824 23-Feb-2016 Robin Lee <rgl@google.com> Trust CA certificates added for the whole OS only am: 4f135c9bd7
am: 63176f4144

* commit '63176f4144a3199f4794162c75acdc1322cd948e':
Trust CA certificates added for the whole OS only
63176f4144a3199f4794162c75acdc1322cd948e 23-Feb-2016 Robin Lee <rgl@google.com> Trust CA certificates added for the whole OS only
am: 4f135c9bd7

* commit '4f135c9bd77a54781d25c866657f0af9ecdd94e1':
Trust CA certificates added for the whole OS only
4f135c9bd77a54781d25c866657f0af9ecdd94e1 22-Feb-2016 Robin Lee <rgl@google.com> Trust CA certificates added for the whole OS only

Excludes any CA certificates installed for wifi-only from being used for
anything else. Does not take effect retroactively against certs which
were already installed.

The CAs will continue to be saved to a part of the keystore accessible
by services running under WIFI_UID.

Bug: 26324357
Bug: 25780055
Change-Id: Ifeb9daf24c9f9a22b2b2daf247d5622c707c9885
rc/com/android/certinstaller/CertInstaller.java
rc/com/android/certinstaller/CredentialHelper.java
1925ce864d3e465ed6f5259aa035401e8d937a70 22-Feb-2016 Robin Lee <rgl@google.com> Merge "Skip password dialog if PKCS#12 has no password" into nyc-dev
6f511d4f1c698350f3e2bffcd6d7a90d01eb47cd 22-Feb-2016 Robin Lee <rgl@google.com> Trust CA certificates added for the whole OS only

Excludes any CA certificates installed for wifi-only from being used for
anything else. Does not take effect retroactively against certs which
were already installed.

The CAs will continue to be saved to a part of the keystore accessible
by services running under WIFI_UID.

Bug: 26324357
Bug: 25780055
Change-Id: Ifeb9daf24c9f9a22b2b2daf247d5622c707c9885
rc/com/android/certinstaller/CertInstaller.java
rc/com/android/certinstaller/CredentialHelper.java
69f2f0bd44b702debf8503236fcf3dc1a9eb26c5 12-Feb-2016 Robin Lee <rgl@google.com> Skip password dialog if PKCS#12 has no password

Just an extra unnecessary step for the user, eg. in the case of a file
generated locally just as an interchange format.

Bug: 27155157
Change-Id: Iafb948172e6a8d33b1742a06e5d0c69dc0658d78
rc/com/android/certinstaller/CertInstaller.java
rc/com/android/certinstaller/CredentialHelper.java
97910a20c5114215e04151d228aefbfde1e52be0 03-Feb-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I062f563b693aec4123b1d3961cc2ad552246ac4a
Auto-generated-cl: translation import
es/values-ro/strings.xml
a79a26e46f6170df9e1e4958e4890b247587bb0d 03-Feb-2016 Geoff Mendal <mendal@google.com> Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 3e4266b322 -s ours
am: e397cec8e6 -s ours

* commit 'e397cec8e6e0557f9ddbf5ad871db8f56f91c5fb':
Import translations. DO NOT MERGE
747170fc0167b162d12df6afe3e22f564a55f7f4 03-Feb-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE am: 5bc3dabe05 -s ours am: 0bfd90d509 -s ours
am: 9edbc73c12 -s ours

* commit '9edbc73c12bd54b15ec44c5966fa841f4473b97c':
Import translations. DO NOT MERGE
e397cec8e6e0557f9ddbf5ad871db8f56f91c5fb 03-Feb-2016 Geoff Mendal <mendal@google.com> Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: 3e4266b322 -s ours

* commit '3e4266b322ee5673ce740e19f3a82166983173a6':
Import translations. DO NOT MERGE
9edbc73c12bd54b15ec44c5966fa841f4473b97c 03-Feb-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE am: 5bc3dabe05 -s ours
am: 0bfd90d509 -s ours

* commit '0bfd90d50987b35e8a37f49c0af362912667235f':
Import translations. DO NOT MERGE
3e4266b322ee5673ce740e19f3a82166983173a6 03-Feb-2016 Geoff Mendal <mendal@google.com> Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
8ed7322bd7ed38c26f49aedc89bb109c3cbffaf8 03-Feb-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I348a9628761e73018e337dd877beeb7f18d4041c
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rBR/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
0bfd90d50987b35e8a37f49c0af362912667235f 02-Feb-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE
am: 5bc3dabe05 -s ours

* commit '5bc3dabe05b3cc4c36cea7c68773cb8ba04fbdd7':
Import translations. DO NOT MERGE
5bc3dabe05b3cc4c36cea7c68773cb8ba04fbdd7 02-Feb-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I039514b1d0e994b71ef58360d1dd70f037dbf65a
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rBR/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
c763ee4d16ca9fd8219272e404d75a314cfbb384 18-Jan-2016 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Iab6346f28ccfa6a1dd0f07618912ebca177cb845
Auto-generated-cl: translation import
es/values-de/strings.xml
aff933748edf3d4e9ea0a5ed6adc03fdbb748207 12-Jan-2016 Jan Nordqvist <jannq@google.com> Drop checks for locked WiFi key store when installing keys/certs.

The security provided by the PIN lock is not considered to provide
any added value over disk encryption for the protection of the WiFi
key store.
In addition the PIN lock is major hurdle for onboarding 802.1X users
who do need a trust cert installed.

BUG=25887356

Change-Id: Ifb8004679ab6b1f155751ff18e29be27e4dce65f
rc/com/android/certinstaller/WiFiInstaller.java
927c1172de7f703bcfc15d223c610295cec5ab54 21-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I25dcbbf11442c18395692b1a31f7977f1fb7c3c7
Auto-generated-cl: translation import
es/values-fa/strings.xml
462d9465b262713cf17d9e2f79cad1c78d1d3ed4 16-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE am: 2c5449ee83 -s ours am: f209c8c7f9 -s ours am: 98dba3ffcb -s ours
am: 4a735d6571 -s ours

* commit '4a735d6571bb803e12fa4b910ce9abe322eb5124':
Import translations. DO NOT MERGE
1152ddd253132cf17b24de153f40aeaa9738b068 16-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I35aa3fd87bfeea7c9993c02462251bcd01683b6d
Auto-generated-cl: translation import
es/values-b+sr+Latn/strings.xml
4a735d6571bb803e12fa4b910ce9abe322eb5124 16-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE am: 2c5449ee83 -s ours am: f209c8c7f9 -s ours
am: 98dba3ffcb -s ours

* commit '98dba3ffcbae0ce3f295e77a881366dfa21fb4f9':
Import translations. DO NOT MERGE
98dba3ffcbae0ce3f295e77a881366dfa21fb4f9 16-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE am: 2c5449ee83 -s ours
am: f209c8c7f9 -s ours

* commit 'f209c8c7f919ea1c06b7b8461b872085e8a0a268':
Import translations. DO NOT MERGE
f209c8c7f919ea1c06b7b8461b872085e8a0a268 16-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE
am: 2c5449ee83 -s ours

* commit '2c5449ee83cb5cebc4f4a53a6c1ee50c6ec8eb03':
Import translations. DO NOT MERGE
2c5449ee83cb5cebc4f4a53a6c1ee50c6ec8eb03 16-Dec-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ic8bd5381238a14bc17f4ef54a61f4325a79160cf
Auto-generated-cl: translation import
es/values-fr-rCA/strings.xml
es/values-nl/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
cb8b5e0b42912e61c91987995987bd71d1e44920 30-Nov-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I05c3645e79f625265d78f0eeca9ae54928cf7245
Auto-generated-cl: translation import
es/values-fr-rCA/strings.xml
es/values-nl/strings.xml
es/values-ru/strings.xml
e6572ba24ca5e2238347929263da69388952dbc9 09-Nov-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ie4831d8e52f181b858aed342352fededc6e5b890
Auto-generated-cl: translation import
es/values-ro/strings.xml
8a418b2ca24b665e332229c943d200a82a723b50 05-Nov-2015 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE am: 5d360f869a -s ours
am: 518d473454 -s ours

* commit '518d47345431ee9c8deab1f3dd550e0a7f65d761':
Import translations. DO NOT MERGE
518d47345431ee9c8deab1f3dd550e0a7f65d761 05-Nov-2015 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE
am: 5d360f869a -s ours

* commit '5d360f869af12c9f3e5d067e7e6dba1d2c1af56d':
Import translations. DO NOT MERGE
5d360f869af12c9f3e5d067e7e6dba1d2c1af56d 05-Nov-2015 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 25433205
Change-Id: I029689928f9c0e08574741f47b3f5ff1a9d8c1fa
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rBR/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
e30d0cce740c3723d599388bad58379b973cef75 21-Oct-2015 Paul Soulos <psoulos@google.com> Merge "Nemo CTS: Call the right class for SSL" into cw-e-dev am: b0876d3cb4 am: cab79670a3
am: d3ddb317d2

* commit 'd3ddb317d2aa00990bcbe52d8b5d1656c55c7869':
Nemo CTS: Call the right class for SSL
d3ddb317d2aa00990bcbe52d8b5d1656c55c7869 21-Oct-2015 Paul Soulos <psoulos@google.com> Merge "Nemo CTS: Call the right class for SSL" into cw-e-dev am: b0876d3cb4
am: cab79670a3

* commit 'cab79670a3342ce04a5bd6d76c35c2746e405c3f':
Nemo CTS: Call the right class for SSL
cab79670a3342ce04a5bd6d76c35c2746e405c3f 21-Oct-2015 Paul Soulos <psoulos@google.com> Merge "Nemo CTS: Call the right class for SSL" into cw-e-dev
am: b0876d3cb4

* commit 'b0876d3cb4e90c21acc23941a80648d45451e7fd':
Nemo CTS: Call the right class for SSL
b0876d3cb4e90c21acc23941a80648d45451e7fd 21-Oct-2015 Paul Soulos <psoulos@google.com> Merge "Nemo CTS: Call the right class for SSL" into cw-e-dev
903c50b002e4ab27693e15c41ffafca9435d487b 21-Oct-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE am: 958f46fd59 -s ours am: 7721edd438 -s ours
am: fdaa91a6e9 -s ours

* commit 'fdaa91a6e99240613793b1ab471dd55cd8c03880':
Import translations. DO NOT MERGE
fdaa91a6e99240613793b1ab471dd55cd8c03880 21-Oct-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE am: 958f46fd59 -s ours
am: 7721edd438 -s ours

* commit '7721edd438afd40cbf764f8ec826375832199009':
Import translations. DO NOT MERGE
7721edd438afd40cbf764f8ec826375832199009 21-Oct-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE
am: 958f46fd59 -s ours

* commit '958f46fd5944f3588ab1b77baae2452270f3a045':
Import translations. DO NOT MERGE
958f46fd5944f3588ab1b77baae2452270f3a045 21-Oct-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: If200864ac5c6070758dd37bf2cf23e3161930484
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rBR/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
33c079a90b605b550b04915be70217f7a3fe61b6 13-Oct-2015 Vinod Krishnan <vinodkrishnan@google.com> Nemo CTS: Call the right class for SSL

Bug: 24305493

Change-Id: I9486c96aa531f72ae7dee1282903bc96eb7faf1c
rc/com/android/certinstaller/CertInstaller.java
rc/com/android/certinstaller/CredentialHelper.java
002ae4f5d0f1f95cfc725c052ac4095871a06eaa 14-Oct-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I2837a8ac42572d39d9ff2e41502190a81188a307
Auto-generated-cl: translation import
es/values-da/strings.xml
f6c7e2d5386518faa38d4e903f94165355e2518b 29-Sep-2015 Baligh Uddin <baligh@google.com> am 0e220405: (-s ours) am 86098b13: (-s ours) Import translations. DO NOT MERGE

* commit '0e22040566819136fe31b05aca933f6f4b48d994':
Import translations. DO NOT MERGE
0e22040566819136fe31b05aca933f6f4b48d994 29-Sep-2015 Baligh Uddin <baligh@google.com> am 86098b13: (-s ours) Import translations. DO NOT MERGE

* commit '86098b13427cef0681d7c7e6209bf34a1174fa15':
Import translations. DO NOT MERGE
86098b13427cef0681d7c7e6209bf34a1174fa15 29-Sep-2015 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I044c7db5b9e129392aa16f74acfd0aabe76ba006
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rBR/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
c0173842d13ab9e301d217b79ac2ea03d8f5fd56 28-Sep-2015 Baligh Uddin <baligh@google.com> am b634c735: (-s ours) am 67826f24: (-s ours) am 49090f38: (-s ours) am 0a66a571: (-s ours) Import translations. DO NOT MERGE

* commit 'b634c735a63bfac246cbcc5288f356a63b96c9ef':
Import translations. DO NOT MERGE
b634c735a63bfac246cbcc5288f356a63b96c9ef 28-Sep-2015 Baligh Uddin <baligh@google.com> am 67826f24: (-s ours) am 49090f38: (-s ours) am 0a66a571: (-s ours) Import translations. DO NOT MERGE

* commit '67826f24ceb6fef3da7605ebc800fcbdaee55ca9':
Import translations. DO NOT MERGE
67826f24ceb6fef3da7605ebc800fcbdaee55ca9 28-Sep-2015 Baligh Uddin <baligh@google.com> am 49090f38: (-s ours) am 0a66a571: (-s ours) Import translations. DO NOT MERGE

* commit '49090f38e7103ce0e5e6b63d1251056d4fe73dfb':
Import translations. DO NOT MERGE
49090f38e7103ce0e5e6b63d1251056d4fe73dfb 27-Sep-2015 Baligh Uddin <baligh@google.com> am 0a66a571: (-s ours) Import translations. DO NOT MERGE

* commit '0a66a571a80538bc765a7bea799cd16f55c513d5':
Import translations. DO NOT MERGE
0a66a571a80538bc765a7bea799cd16f55c513d5 26-Sep-2015 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I61b565889197a32fbb2af9a1a6fe5ca9d137e352
Auto-generated-cl: translation import
es/values-fa/strings.xml
52003c273562382e083ba3403b53a24b681edb4e 26-Sep-2015 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I4b14ed750f69ce934b1572db7297a5a60d420c44
Auto-generated-cl: translation import
es/values-fa/strings.xml
es/values-ja/strings.xml
c92eabfa7772a8f68e80745fd1df6b36328ecc49 19-Sep-2015 Baligh Uddin <baligh@google.com> am 6a29c980: (-s ours) am d77c9938: (-s ours) am 2813ac1a: (-s ours) am bf0cc6c9: (-s ours) Import translations. DO NOT MERGE

* commit '6a29c980686c6f592cef8997b706f4a20198599f':
Import translations. DO NOT MERGE
6a29c980686c6f592cef8997b706f4a20198599f 19-Sep-2015 Baligh Uddin <baligh@google.com> am d77c9938: (-s ours) am 2813ac1a: (-s ours) am bf0cc6c9: (-s ours) Import translations. DO NOT MERGE

* commit 'd77c9938075c4b305be1f76e743f4a160a098872':
Import translations. DO NOT MERGE
d77c9938075c4b305be1f76e743f4a160a098872 19-Sep-2015 Baligh Uddin <baligh@google.com> am 2813ac1a: (-s ours) am bf0cc6c9: (-s ours) Import translations. DO NOT MERGE

* commit '2813ac1a8b6ab1921cde41eb1e2a0f010dcd98cd':
Import translations. DO NOT MERGE
2813ac1a8b6ab1921cde41eb1e2a0f010dcd98cd 19-Sep-2015 Baligh Uddin <baligh@google.com> am bf0cc6c9: (-s ours) Import translations. DO NOT MERGE

* commit 'bf0cc6c95788d1bd121a1aeb74bf2534e8f12c49':
Import translations. DO NOT MERGE
bf0cc6c95788d1bd121a1aeb74bf2534e8f12c49 18-Sep-2015 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I97aba4b00dfa5170c2d7d81e70c254fba2ce2d64
Auto-generated-cl: translation import
es/values-ja/strings.xml
09f78cb184d3f692a5e96c76531557a8f43efba2 28-Aug-2015 Geoff Mendal <mendal@google.com> am dd1b6a64: (-s ours) am 5aefdeaf: (-s ours) am 1a472153: (-s ours) Import translations. DO NOT MERGE

* commit 'dd1b6a6436c037b3fc24182ff266e4e4e93cb993':
5a6f3d2dc6b973c5c5e351bcc3944a663cbe9cfd 28-Aug-2015 Sanket Padawe <sanketpadawe@google.com> am 07b3ab7e: am 71dad82e: (-s ours) am 909641b2: Offload time consuming task to background while installing HS profile.

* commit '07b3ab7e357ba0f685799b9e586c69e5a9c78938':
504ee4f52fcf314bfba03e27cdf9b56015dcf3ab 28-Aug-2015 Jan Nordqvist <jannq@google.com> am 596a7160: am f079d61a: (-s ours) am 09e91a70: Merge "Added "Installing" string." into mnc-dev

* commit '596a71603b12da2321241be3c68afe732e3e1ad5':
f86aaaddd881aa131c479fa00a3eb5ed6924ffb9 28-Aug-2015 Jan Nordqvist <jannq@google.com> am ebcae1ce: am f2393bf1: (-s ours) am fb90c6fc: Added logging in a few error paths for wifi config installation.

* commit 'ebcae1ceb189c03ea593d18220452d9b782cbb2d':
de54724a9d8abbbf85a7e40eb90be70682eb5c2c 28-Aug-2015 Geoff Mendal <mendal@google.com> am 035b315e: (-s ours) am cbef333f: (-s ours) am a583f03e: (-s ours) Import translations. DO NOT MERGE

* commit '035b315e458847e3da754672965db34bb8d7cf3a':
df6668318bd2bda5591feeb65b68b1d2c97a54c4 28-Aug-2015 Vinit Deshpande <vinitd@google.com> am f293b4d2: am ea401b03: (-s ours) am 219360da: Merge "Allowing rewrite of Passpoint credential." into mnc-dev

* commit 'f293b4d2997cf0b4b0ada723d0ba7a2bfe69c5fd':
5187f6582522a0be0a0ac45509ee09bda5ad7cc5 28-Aug-2015 Geoff Mendal <mendal@google.com> am c5aea6f9: (-s ours) am bb2c855e: (-s ours) am c629ad26: (-s ours) Import translations. DO NOT MERGE

* commit 'c5aea6f9c4745bf9c343122ab4cbd3fdd8066b75':
447ee34fed1ac99fa1fbdf27da9fbaab6910486b 28-Aug-2015 Geoff Mendal <mendal@google.com> am 50d6db7e: (-s ours) am 065fb0d0: (-s ours) am f8aeaac0: (-s ours) Import translations. DO NOT MERGE

* commit '50d6db7ec35f494ca262e3fc6b05938e56cfa8c8':
104fae39aa334bea12c92191a5c1ec275ab7ffc4 28-Aug-2015 Geoff Mendal <mendal@google.com> am a7eb5211: (-s ours) am e15fd1fc: (-s ours) am dc924634: (-s ours) Import translations. DO NOT MERGE

* commit 'a7eb52117ce908a1af1b08b17d92e812a5422f66':
dd1b6a6436c037b3fc24182ff266e4e4e93cb993 27-Aug-2015 Geoff Mendal <mendal@google.com> am 5aefdeaf: (-s ours) am 1a472153: (-s ours) Import translations. DO NOT MERGE

* commit '5aefdeaf0df8113ac6dc5eb6702a45570a0ec229':
07b3ab7e357ba0f685799b9e586c69e5a9c78938 27-Aug-2015 Sanket Padawe <sanketpadawe@google.com> am 71dad82e: (-s ours) am 909641b2: Offload time consuming task to background while installing HS profile.

* commit '71dad82eb967c1b7b2590d60ee6df60749834de6':
596a71603b12da2321241be3c68afe732e3e1ad5 27-Aug-2015 Jan Nordqvist <jannq@google.com> am f079d61a: (-s ours) am 09e91a70: Merge "Added "Installing" string." into mnc-dev

* commit 'f079d61add8189976aa5f5d226d113c9f729da39':
ebcae1ceb189c03ea593d18220452d9b782cbb2d 27-Aug-2015 Jan Nordqvist <jannq@google.com> am f2393bf1: (-s ours) am fb90c6fc: Added logging in a few error paths for wifi config installation.

* commit 'f2393bf17284cead90c0cf661823138022f7d90e':
035b315e458847e3da754672965db34bb8d7cf3a 27-Aug-2015 Geoff Mendal <mendal@google.com> am cbef333f: (-s ours) am a583f03e: (-s ours) Import translations. DO NOT MERGE

* commit 'cbef333f7f487e333065091b40002abf703e9472':
f293b4d2997cf0b4b0ada723d0ba7a2bfe69c5fd 27-Aug-2015 Vinit Deshpande <vinitd@google.com> am ea401b03: (-s ours) am 219360da: Merge "Allowing rewrite of Passpoint credential." into mnc-dev

* commit 'ea401b039ef26f6451139b170c80c690a09fb1f7':
c5aea6f9c4745bf9c343122ab4cbd3fdd8066b75 27-Aug-2015 Geoff Mendal <mendal@google.com> am bb2c855e: (-s ours) am c629ad26: (-s ours) Import translations. DO NOT MERGE

* commit 'bb2c855e8592f6d17b5838609f8f88c4d5c8663e':
50d6db7ec35f494ca262e3fc6b05938e56cfa8c8 27-Aug-2015 Geoff Mendal <mendal@google.com> am 065fb0d0: (-s ours) am f8aeaac0: (-s ours) Import translations. DO NOT MERGE

* commit '065fb0d06fa29a3d44d001f9207d726235b8dc12':
a7eb52117ce908a1af1b08b17d92e812a5422f66 27-Aug-2015 Geoff Mendal <mendal@google.com> am e15fd1fc: (-s ours) am dc924634: (-s ours) Import translations. DO NOT MERGE

* commit 'e15fd1fc6b64108aa72f2da2902c0f5dddda0218':
409729c757ddd8063b173a2fabfdbff71e3134d9 19-Aug-2015 Geoff Mendal <mendal@google.com> am 8a41c31b: (-s ours) am 437e671c: (-s ours) am f3c2168d: (-s ours) am cb405ac6: (-s ours) Import translations. DO NOT MERGE

* commit '8a41c31be7b31d96501bf0096e5b3e03757db9ec':
Import translations. DO NOT MERGE
8a41c31be7b31d96501bf0096e5b3e03757db9ec 19-Aug-2015 Geoff Mendal <mendal@google.com> am 437e671c: (-s ours) am f3c2168d: (-s ours) am cb405ac6: (-s ours) Import translations. DO NOT MERGE

* commit '437e671c30751f70e70f819380855e19fb77e825':
Import translations. DO NOT MERGE
437e671c30751f70e70f819380855e19fb77e825 19-Aug-2015 Geoff Mendal <mendal@google.com> am f3c2168d: (-s ours) am cb405ac6: (-s ours) Import translations. DO NOT MERGE

* commit 'f3c2168d102fecec3bcfcca1bd26353190e55dbb':
Import translations. DO NOT MERGE
f3c2168d102fecec3bcfcca1bd26353190e55dbb 19-Aug-2015 Geoff Mendal <mendal@google.com> am cb405ac6: (-s ours) Import translations. DO NOT MERGE

* commit 'cb405ac620f70de541c243bc687bc579ce9d1a19':
Import translations. DO NOT MERGE
cb405ac620f70de541c243bc687bc579ce9d1a19 19-Aug-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I4c62f60aca954d239091ef8ada1aee89f1cb718d
Auto-generated-cl: translation import
es/values-ro/strings.xml
fbf41c7351210508d2d9334e382b4065f7c78716 19-Aug-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Id470298db6af9f435372d17463eccfb53f121064
Auto-generated-cl: translation import
es/values-ro/strings.xml
4d953a91c7d30a37942de171c1a08d9a8d30e81e 08-Aug-2015 Geoff Mendal <mendal@google.com> am acfbef64: (-s ours) am 93e65480: (-s ours) am 6727a9bc: (-s ours) am 17aa0495: (-s ours) Import translations. DO NOT MERGE

* commit 'acfbef64e9ef1d8a6a263b607e7243d7498f96dd':
Import translations. DO NOT MERGE
acfbef64e9ef1d8a6a263b607e7243d7498f96dd 08-Aug-2015 Geoff Mendal <mendal@google.com> am 93e65480: (-s ours) am 6727a9bc: (-s ours) am 17aa0495: (-s ours) Import translations. DO NOT MERGE

* commit '93e654804609cfb9c5d7d15334345b9349505ef1':
Import translations. DO NOT MERGE
93e654804609cfb9c5d7d15334345b9349505ef1 08-Aug-2015 Geoff Mendal <mendal@google.com> am 6727a9bc: (-s ours) am 17aa0495: (-s ours) Import translations. DO NOT MERGE

* commit '6727a9bcf2f854e8b76ea231e8d029ac475a179a':
Import translations. DO NOT MERGE
6727a9bcf2f854e8b76ea231e8d029ac475a179a 08-Aug-2015 Geoff Mendal <mendal@google.com> am 17aa0495: (-s ours) Import translations. DO NOT MERGE

* commit '17aa049528e4468b6f0b66e9a305beafb5635a79':
Import translations. DO NOT MERGE
17aa049528e4468b6f0b66e9a305beafb5635a79 08-Aug-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Iaa0da6693419210664580d13081ab943b66f4483
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-de/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hy-rAM/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-km-rKH/strings.xml
es/values-lv/strings.xml
es/values-nb/strings.xml
es/values-pa-rIN/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-ur-rPK/strings.xml
es/values-zh-rHK/strings.xml
f215954c1324a3fe9317ae7a5df5083bcf60b8e5 08-Aug-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I61c331e4f47654a19e98c474f32e8320ebbc5f69
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-de/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-hy-rAM/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-km-rKH/strings.xml
es/values-lv/strings.xml
es/values-nb/strings.xml
es/values-pa-rIN/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-ur-rPK/strings.xml
es/values-zh-rHK/strings.xml
d9a416dfc1481b298feeaeeb5cffdabf6218b384 07-Aug-2015 Geoff Mendal <mendal@google.com> am a051cb4f: (-s ours) am 7b63ee38: (-s ours) am d2dde28a: (-s ours) am 06237447: (-s ours) am 1a472153: (-s ours) Import translations. DO NOT MERGE

* commit 'a051cb4f946fc8b01ca7c5f0086bd0fbac27b670':
Import translations. DO NOT MERGE
a051cb4f946fc8b01ca7c5f0086bd0fbac27b670 07-Aug-2015 Geoff Mendal <mendal@google.com> am 7b63ee38: (-s ours) am d2dde28a: (-s ours) am 06237447: (-s ours) am 1a472153: (-s ours) Import translations. DO NOT MERGE

* commit '7b63ee38c85d449278e6dca9ec2931c1d62a17b4':
Import translations. DO NOT MERGE
7b63ee38c85d449278e6dca9ec2931c1d62a17b4 07-Aug-2015 Geoff Mendal <mendal@google.com> am d2dde28a: (-s ours) am 06237447: (-s ours) am 1a472153: (-s ours) Import translations. DO NOT MERGE

* commit 'd2dde28a94c79553866708dcfbb68aabb7d56e72':
Import translations. DO NOT MERGE
d2dde28a94c79553866708dcfbb68aabb7d56e72 07-Aug-2015 Geoff Mendal <mendal@google.com> am 06237447: (-s ours) am 1a472153: (-s ours) Import translations. DO NOT MERGE

* commit '062374474efc97dc45121635767789c8378272b4':
Import translations. DO NOT MERGE
062374474efc97dc45121635767789c8378272b4 07-Aug-2015 Geoff Mendal <mendal@google.com> am 1a472153: (-s ours) Import translations. DO NOT MERGE

* commit '1a4721537879353580be60784e95e89ddbf9419c':
Import translations. DO NOT MERGE
5aefdeaf0df8113ac6dc5eb6702a45570a0ec229 07-Aug-2015 Geoff Mendal <mendal@google.com> am 1a472153: (-s ours) Import translations. DO NOT MERGE

* commit '1a4721537879353580be60784e95e89ddbf9419c':
Import translations. DO NOT MERGE
1a4721537879353580be60784e95e89ddbf9419c 07-Aug-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 22921398
Change-Id: Ieca23bb01c6f21eab7ea51dd21ef199ebe628cad
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rBR/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
c79d1355ae63e875599a011d6085a041bd72e452 06-Aug-2015 Sanket Padawe <sanketpadawe@google.com> am b308e877: am dcc31d19: am b6e3c263: am 78f25fd3: am 909641b2: Offload time consuming task to background while installing HS profile.

* commit 'b308e877dc60bc1f295e744de162b431e0241859':
Offload time consuming task to background while installing HS profile.
b308e877dc60bc1f295e744de162b431e0241859 06-Aug-2015 Sanket Padawe <sanketpadawe@google.com> am dcc31d19: am b6e3c263: am 78f25fd3: am 909641b2: Offload time consuming task to background while installing HS profile.

* commit 'dcc31d1948c768f17dbb116bfb7c288d88366d89':
Offload time consuming task to background while installing HS profile.
dcc31d1948c768f17dbb116bfb7c288d88366d89 06-Aug-2015 Sanket Padawe <sanketpadawe@google.com> am b6e3c263: am 78f25fd3: am 909641b2: Offload time consuming task to background while installing HS profile.

* commit 'b6e3c263a2b3784b10fd0961c64d27c68230fad6':
Offload time consuming task to background while installing HS profile.
b6e3c263a2b3784b10fd0961c64d27c68230fad6 06-Aug-2015 Sanket Padawe <sanketpadawe@google.com> am 78f25fd3: am 909641b2: Offload time consuming task to background while installing HS profile.

* commit '78f25fd30ba348daedf520f666d88764bbdf0c91':
Offload time consuming task to background while installing HS profile.
71dad82eb967c1b7b2590d60ee6df60749834de6 06-Aug-2015 Sanket Padawe <sanketpadawe@google.com> am 909641b2: Offload time consuming task to background while installing HS profile.

* commit '909641b23712b9066b514442b236dfc47c1e3279':
Offload time consuming task to background while installing HS profile.
78f25fd30ba348daedf520f666d88764bbdf0c91 06-Aug-2015 Sanket Padawe <sanketpadawe@google.com> am 909641b2: Offload time consuming task to background while installing HS profile.

* commit '909641b23712b9066b514442b236dfc47c1e3279':
Offload time consuming task to background while installing HS profile.
909641b23712b9066b514442b236dfc47c1e3279 05-Aug-2015 Sanket Padawe <sanketpadawe@google.com> Offload time consuming task to background while installing HS profile.

+ Avoid Wifi api calls when wifi is disabled.

Bug: 22921398
Change-Id: I21b0db5b2926c4bbd5473d84855ec1ef2e83734b
es/values/strings.xml
rc/com/android/certinstaller/WiFiInstaller.java
2e9d1b8e91bfc9c7f204d12ea52fc21777b54ed9 05-Aug-2015 Geoff Mendal <mendal@google.com> am 1c2b10d2: (-s ours) am 3327bbaa: (-s ours) am 2da85ade: (-s ours) am 10ae7dbe: (-s ours) Import translations. DO NOT MERGE

* commit '1c2b10d208f76f88757eadfafa75d049d6310270':
Import translations. DO NOT MERGE
1c2b10d208f76f88757eadfafa75d049d6310270 05-Aug-2015 Geoff Mendal <mendal@google.com> am 3327bbaa: (-s ours) am 2da85ade: (-s ours) am 10ae7dbe: (-s ours) Import translations. DO NOT MERGE

* commit '3327bbaa6339efb128b26abb76a411fece01a6ab':
Import translations. DO NOT MERGE
3327bbaa6339efb128b26abb76a411fece01a6ab 05-Aug-2015 Geoff Mendal <mendal@google.com> am 2da85ade: (-s ours) am 10ae7dbe: (-s ours) Import translations. DO NOT MERGE

* commit '2da85adeb3bfdf0281c015bcd91ee3c490890297':
Import translations. DO NOT MERGE
2da85adeb3bfdf0281c015bcd91ee3c490890297 05-Aug-2015 Geoff Mendal <mendal@google.com> am 10ae7dbe: (-s ours) Import translations. DO NOT MERGE

* commit '10ae7dbe82a193a9ea53e0abdfa0bcf2c9826dca':
Import translations. DO NOT MERGE
10ae7dbe82a193a9ea53e0abdfa0bcf2c9826dca 05-Aug-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I7f3353bb3f40ea6b3202d9e62813343bde6e0510
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rBR/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
9e8cf967fb7cd3ab70c30a2a917517f72c3b9461 05-Aug-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Idce296d4ba12ab77d25fc0a4265f2df8877f468f
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rBR/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
7cff4f87229de42b362efcda1b617b022c7a4e56 04-Aug-2015 Jan Nordqvist <jannq@google.com> am b81a13ea: am e334f5a7: am 5a59bdb2: am 1be8a62b: am 09e91a70: Merge "Added "Installing" string." into mnc-dev

* commit 'b81a13ead25150779bb58c8e4fbb18eb33a5d1ea':
Added "Installing" string.
f079d61add8189976aa5f5d226d113c9f729da39 04-Aug-2015 Jan Nordqvist <jannq@google.com> am 09e91a70: Merge "Added "Installing" string." into mnc-dev

* commit '09e91a7070452f41c9fdeaa12ff23e7ca876a4fe':
Added "Installing" string.
b81a13ead25150779bb58c8e4fbb18eb33a5d1ea 04-Aug-2015 Jan Nordqvist <jannq@google.com> am e334f5a7: am 5a59bdb2: am 1be8a62b: am 09e91a70: Merge "Added "Installing" string." into mnc-dev

* commit 'e334f5a7b4cac12f778690ef50e5f13ed7a702c8':
Added "Installing" string.
e334f5a7b4cac12f778690ef50e5f13ed7a702c8 04-Aug-2015 Jan Nordqvist <jannq@google.com> am 5a59bdb2: am 1be8a62b: am 09e91a70: Merge "Added "Installing" string." into mnc-dev

* commit '5a59bdb21d142ba9750e1f239ecbcc3a3c5505b4':
Added "Installing" string.
5a59bdb21d142ba9750e1f239ecbcc3a3c5505b4 04-Aug-2015 Jan Nordqvist <jannq@google.com> am 1be8a62b: am 09e91a70: Merge "Added "Installing" string." into mnc-dev

* commit '1be8a62bfe665cdd9f466c3a39d099d7fd3db57c':
Added "Installing" string.
1be8a62bfe665cdd9f466c3a39d099d7fd3db57c 04-Aug-2015 Jan Nordqvist <jannq@google.com> am 09e91a70: Merge "Added "Installing" string." into mnc-dev

* commit '09e91a7070452f41c9fdeaa12ff23e7ca876a4fe':
Added "Installing" string.
09e91a7070452f41c9fdeaa12ff23e7ca876a4fe 04-Aug-2015 Jan Nordqvist <jannq@google.com> Merge "Added "Installing" string." into mnc-dev
a3b5973d62e7a23125e5ab6cf26f1585f65b9329 04-Aug-2015 Jan Nordqvist <jannq@google.com> Added "Installing" string.

Bug: 22921398
Change-Id: I47b159fb9ac7d8e5211946f6dd88fd70e9a0c65c
es/values/strings.xml
acc0f6fbc7612a0801f6dddbfea09d961c013d69 01-Aug-2015 Jan Nordqvist <jannq@google.com> am 4e894ea1: am 353dd0cd: am d415d944: am 89a882a2: am fb90c6fc: Added logging in a few error paths for wifi config installation.

* commit '4e894ea1210708f9f4f24031d1043fab2ce1a1b1':
Added logging in a few error paths for wifi config installation.
4e894ea1210708f9f4f24031d1043fab2ce1a1b1 01-Aug-2015 Jan Nordqvist <jannq@google.com> am 353dd0cd: am d415d944: am 89a882a2: am fb90c6fc: Added logging in a few error paths for wifi config installation.

* commit '353dd0cd03ca11e928531f8764c2a9529ffceb5b':
Added logging in a few error paths for wifi config installation.
353dd0cd03ca11e928531f8764c2a9529ffceb5b 01-Aug-2015 Jan Nordqvist <jannq@google.com> am d415d944: am 89a882a2: am fb90c6fc: Added logging in a few error paths for wifi config installation.

* commit 'd415d944f2a65d5e369b00c06bdf07e6abd982d1':
Added logging in a few error paths for wifi config installation.
d415d944f2a65d5e369b00c06bdf07e6abd982d1 01-Aug-2015 Jan Nordqvist <jannq@google.com> am 89a882a2: am fb90c6fc: Added logging in a few error paths for wifi config installation.

* commit '89a882a2eefc5cd2ff3a293cd4637d119d653e27':
Added logging in a few error paths for wifi config installation.
1abc9cd9fb297b0f02bb13d91c2003ae8d812b89 01-Aug-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ieb496d3eb913994eff3ea6c4c9dc7b124610efcc
Auto-generated-cl: translation import
es/values-ky-rKG/strings.xml
f2393bf17284cead90c0cf661823138022f7d90e 01-Aug-2015 Jan Nordqvist <jannq@google.com> am fb90c6fc: Added logging in a few error paths for wifi config installation.

* commit 'fb90c6fc3726b1bcfdbb2bd3db03c731a5316790':
Added logging in a few error paths for wifi config installation.
89a882a2eefc5cd2ff3a293cd4637d119d653e27 01-Aug-2015 Jan Nordqvist <jannq@google.com> am fb90c6fc: Added logging in a few error paths for wifi config installation.

* commit 'fb90c6fc3726b1bcfdbb2bd3db03c731a5316790':
Added logging in a few error paths for wifi config installation.
fb90c6fc3726b1bcfdbb2bd3db03c731a5316790 01-Aug-2015 Jan Nordqvist <jannq@google.com> Added logging in a few error paths for wifi config installation.

Bug: 22790527
Change-Id: I8f4bb40a572ae4e7f855e4bf4b028f9b889c5af1
rc/com/android/certinstaller/WiFiInstaller.java
c5d0bdb39084ed7f18a09085403a6cc7da82b18a 22-Jul-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I66023f47b5a2dcacf447b69feb3b9559aaca3761
Auto-generated-cl: translation import
es/values-pt-rBR/strings.xml
f95701e7074b64944c00e5668955ce78bed379f5 15-Jul-2015 Geoff Mendal <mendal@google.com> am 7ac206ec: (-s ours) am dae76911: (-s ours) am a7861d47: (-s ours) am 6c53d1e3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '7ac206ec824dc9279a2df8549254263aa9c07409':
Import translations. DO NOT MERGE
c517251a54671659a34867b3404b979674fc65e7 15-Jul-2015 Geoff Mendal <mendal@google.com> am 0df42b51: (-s ours) am 6a534e32: (-s ours) am 1e9bb52d: (-s ours) am f36ac064: (-s ours) am a583f03e: (-s ours) Import translations. DO NOT MERGE

* commit '0df42b517fd4f11c470c6d2ecb61933ea524d8cc':
Import translations. DO NOT MERGE
7ac206ec824dc9279a2df8549254263aa9c07409 15-Jul-2015 Geoff Mendal <mendal@google.com> am dae76911: (-s ours) am a7861d47: (-s ours) am 6c53d1e3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit 'dae769119bbf1af5bb2b5cb7b39fdc354815e40c':
Import translations. DO NOT MERGE
0df42b517fd4f11c470c6d2ecb61933ea524d8cc 15-Jul-2015 Geoff Mendal <mendal@google.com> am 6a534e32: (-s ours) am 1e9bb52d: (-s ours) am f36ac064: (-s ours) am a583f03e: (-s ours) Import translations. DO NOT MERGE

* commit '6a534e3227a459dd7e67a3b509938ddd090e37db':
Import translations. DO NOT MERGE
dae769119bbf1af5bb2b5cb7b39fdc354815e40c 15-Jul-2015 Geoff Mendal <mendal@google.com> am a7861d47: (-s ours) am 6c53d1e3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit 'a7861d47e934d847c8d1bf7d8bf3312a7769fcd9':
Import translations. DO NOT MERGE
6a534e3227a459dd7e67a3b509938ddd090e37db 15-Jul-2015 Geoff Mendal <mendal@google.com> am 1e9bb52d: (-s ours) am f36ac064: (-s ours) am a583f03e: (-s ours) Import translations. DO NOT MERGE

* commit '1e9bb52d682efa84cdbcde173fa936efcef36781':
Import translations. DO NOT MERGE
a7861d47e934d847c8d1bf7d8bf3312a7769fcd9 15-Jul-2015 Geoff Mendal <mendal@google.com> am 6c53d1e3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '6c53d1e3fa0b7398075ee25d2ed9438cd61ddd70':
Import translations. DO NOT MERGE
1e9bb52d682efa84cdbcde173fa936efcef36781 15-Jul-2015 Geoff Mendal <mendal@google.com> am f36ac064: (-s ours) am a583f03e: (-s ours) Import translations. DO NOT MERGE

* commit 'f36ac0645c333f64d041b221369b7a424d4b5d5d':
Import translations. DO NOT MERGE
6c53d1e3fa0b7398075ee25d2ed9438cd61ddd70 15-Jul-2015 Geoff Mendal <mendal@google.com> Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
96010a863fb532ae01813e80affca8df734190e8 15-Jul-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I283d04658eccd1959b8a6fdd8ce5e5215d34ebc7
Auto-generated-cl: translation import
es/values-gu-rIN/strings.xml
es/values-ta-rIN/strings.xml
f36ac0645c333f64d041b221369b7a424d4b5d5d 15-Jul-2015 Geoff Mendal <mendal@google.com> am a583f03e: (-s ours) Import translations. DO NOT MERGE

* commit 'a583f03e488628f29428d6b034d5d7b4b3df98e7':
Import translations. DO NOT MERGE
cbef333f7f487e333065091b40002abf703e9472 15-Jul-2015 Geoff Mendal <mendal@google.com> am a583f03e: (-s ours) Import translations. DO NOT MERGE

* commit 'a583f03e488628f29428d6b034d5d7b4b3df98e7':
Import translations. DO NOT MERGE
a583f03e488628f29428d6b034d5d7b4b3df98e7 15-Jul-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: If7bd7f142e2082ba4ef34731a1efd909fa754246
Auto-generated-cl: translation import
es/values-gu-rIN/strings.xml
es/values-ta-rIN/strings.xml
8dd4798cbb41a121195ec0cd70fd65aec3124757 15-Jul-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I4d5ceea04fffa92e27a7c1b8aa1430e82cdba8e8
Auto-generated-cl: translation import
es/values-gu-rIN/strings.xml
es/values-ta-rIN/strings.xml
41b3414e2dfc4998c1b0de30f701d2edac11350c 14-Jul-2015 Vinit Deshpande <vinitd@google.com> am afb2c9e1: am 592b7aa3: am bd70da0c: am 48d644ff: am 219360da: Merge "Allowing rewrite of Passpoint credential." into mnc-dev

* commit 'afb2c9e15745c5d11489ecd148bb2552b12058be':
Allowing rewrite of Passpoint credential.
afb2c9e15745c5d11489ecd148bb2552b12058be 14-Jul-2015 Vinit Deshpande <vinitd@google.com> am 592b7aa3: am bd70da0c: am 48d644ff: am 219360da: Merge "Allowing rewrite of Passpoint credential." into mnc-dev

* commit '592b7aa39d0a29fe8906fc55bd91db658f26e737':
Allowing rewrite of Passpoint credential.
5c87d42ed837f9983fd83de15d8e4d96bd52f498 14-Jul-2015 Geoff Mendal <mendal@google.com> am 792ea471: (-s ours) am ddacab2a: (-s ours) am 0cb87ab7: (-s ours) am f46f52f1: (-s ours) am c629ad26: (-s ours) Import translations. DO NOT MERGE

* commit '792ea4717772ce6c5af5dc032a54b805fa39c999':
Import translations. DO NOT MERGE
792ea4717772ce6c5af5dc032a54b805fa39c999 14-Jul-2015 Geoff Mendal <mendal@google.com> am ddacab2a: (-s ours) am 0cb87ab7: (-s ours) am f46f52f1: (-s ours) am c629ad26: (-s ours) Import translations. DO NOT MERGE

* commit 'ddacab2a743fa38aec56258b8ccc9c4e1f496bf8':
Import translations. DO NOT MERGE
592b7aa39d0a29fe8906fc55bd91db658f26e737 14-Jul-2015 Vinit Deshpande <vinitd@google.com> am bd70da0c: am 48d644ff: am 219360da: Merge "Allowing rewrite of Passpoint credential." into mnc-dev

* commit 'bd70da0c584766810470882007ec9b7554dc55bb':
Allowing rewrite of Passpoint credential.
bd70da0c584766810470882007ec9b7554dc55bb 14-Jul-2015 Vinit Deshpande <vinitd@google.com> am 48d644ff: am 219360da: Merge "Allowing rewrite of Passpoint credential." into mnc-dev

* commit '48d644ffb3b8245aeacf596302688b1a1ff94e7a':
Allowing rewrite of Passpoint credential.
ddacab2a743fa38aec56258b8ccc9c4e1f496bf8 14-Jul-2015 Geoff Mendal <mendal@google.com> am 0cb87ab7: (-s ours) am f46f52f1: (-s ours) am c629ad26: (-s ours) Import translations. DO NOT MERGE

* commit '0cb87ab7bc36c6eaa770e0ccdbf29f4e28c2b849':
Import translations. DO NOT MERGE
ea401b039ef26f6451139b170c80c690a09fb1f7 14-Jul-2015 Vinit Deshpande <vinitd@google.com> am 219360da: Merge "Allowing rewrite of Passpoint credential." into mnc-dev

* commit '219360da8f75362f537a03f128233b7406f0b834':
Allowing rewrite of Passpoint credential.
48d644ffb3b8245aeacf596302688b1a1ff94e7a 14-Jul-2015 Vinit Deshpande <vinitd@google.com> am 219360da: Merge "Allowing rewrite of Passpoint credential." into mnc-dev

* commit '219360da8f75362f537a03f128233b7406f0b834':
Allowing rewrite of Passpoint credential.
219360da8f75362f537a03f128233b7406f0b834 14-Jul-2015 Vinit Deshpande <vinitd@google.com> Merge "Allowing rewrite of Passpoint credential." into mnc-dev
0cb87ab7bc36c6eaa770e0ccdbf29f4e28c2b849 14-Jul-2015 Geoff Mendal <mendal@google.com> am f46f52f1: (-s ours) am c629ad26: (-s ours) Import translations. DO NOT MERGE

* commit 'f46f52f1b2c15fec1bbf79c16638426ac7ba159b':
Import translations. DO NOT MERGE
f46f52f1b2c15fec1bbf79c16638426ac7ba159b 14-Jul-2015 Geoff Mendal <mendal@google.com> am c629ad26: (-s ours) Import translations. DO NOT MERGE

* commit 'c629ad266844a93d60a48fcb7d3b1ef91f577c37':
Import translations. DO NOT MERGE
66d9076e8d96b60f7eecaf7398cdd6c79d4ffc51 13-Jul-2015 Geoff Mendal <mendal@google.com> am 8a9fb7c7: (-s ours) am ff1f4194: (-s ours) am 58ceabbc: (-s ours) am 51e2539a: (-s ours) Import translations. DO NOT MERGE

* commit '8a9fb7c74c16e4581ff35ba720101fb56f39eaca':
Import translations. DO NOT MERGE
8a9fb7c74c16e4581ff35ba720101fb56f39eaca 13-Jul-2015 Geoff Mendal <mendal@google.com> am ff1f4194: (-s ours) am 58ceabbc: (-s ours) am 51e2539a: (-s ours) Import translations. DO NOT MERGE

* commit 'ff1f41941b995ca237e27af87fa02ad4808b07d5':
Import translations. DO NOT MERGE
ff1f41941b995ca237e27af87fa02ad4808b07d5 13-Jul-2015 Geoff Mendal <mendal@google.com> am 58ceabbc: (-s ours) am 51e2539a: (-s ours) Import translations. DO NOT MERGE

* commit '58ceabbcb862a113d76fe45b5da7c9e3c853c762':
Import translations. DO NOT MERGE
58ceabbcb862a113d76fe45b5da7c9e3c853c762 13-Jul-2015 Geoff Mendal <mendal@google.com> am 51e2539a: (-s ours) Import translations. DO NOT MERGE

* commit '51e2539a2c352a312fcd8fa027f6b668e289fb06':
Import translations. DO NOT MERGE
bb2c855e8592f6d17b5838609f8f88c4d5c8663e 13-Jul-2015 Geoff Mendal <mendal@google.com> am c629ad26: (-s ours) Import translations. DO NOT MERGE

* commit 'c629ad266844a93d60a48fcb7d3b1ef91f577c37':
Import translations. DO NOT MERGE
51e2539a2c352a312fcd8fa027f6b668e289fb06 11-Jul-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ic48f8925140daeb642353dd4cc6fc6c609b90b32
Auto-generated-cl: translation import
es/values-ca/strings.xml
es/values-es-rUS/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ml-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-th/strings.xml
es/values-uz-rUZ/strings.xml
c629ad266844a93d60a48fcb7d3b1ef91f577c37 11-Jul-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Id15f99702a8f70becda8fb2ae3bfcf2f8c2c6ae2
Auto-generated-cl: translation import
es/values-ml-rIN/strings.xml
38409dbbdb4975e97ff1e8592c6d83174ac50d6f 11-Jul-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Iad848f421a57b01f170f4e87f0275e4b627fdc58
Auto-generated-cl: translation import
es/values-ml-rIN/strings.xml
580c5f5ab98c391d113db67c6a304e4dd179f508 09-Jul-2015 Jan Nordqvist <jannq@google.com> Allowing rewrite of Passpoint credential.

Bug: 21779835
Change-Id: I5b551f332f6d487896359147137cb1fc605b109a
rc/com/android/certinstaller/WiFiInstaller.java
318c3a879000c902d1b8e865df694d9aefb3a9b4 08-Jul-2015 Geoff Mendal <mendal@google.com> am 863f617f: (-s ours) am 6af2abdd: (-s ours) am 0b76d2bd: (-s ours) am 2a6441e3: (-s ours) am f8aeaac0: (-s ours) Import translations. DO NOT MERGE

* commit '863f617f4f38a7431290519e43fb4fc2f9ad967f':
Import translations. DO NOT MERGE
863f617f4f38a7431290519e43fb4fc2f9ad967f 08-Jul-2015 Geoff Mendal <mendal@google.com> am 6af2abdd: (-s ours) am 0b76d2bd: (-s ours) am 2a6441e3: (-s ours) am f8aeaac0: (-s ours) Import translations. DO NOT MERGE

* commit '6af2abdda074fcc92693daee87aa4cdec6418cd2':
Import translations. DO NOT MERGE
6af2abdda074fcc92693daee87aa4cdec6418cd2 08-Jul-2015 Geoff Mendal <mendal@google.com> am 0b76d2bd: (-s ours) am 2a6441e3: (-s ours) am f8aeaac0: (-s ours) Import translations. DO NOT MERGE

* commit '0b76d2bd4565c991417a0fdfba18fc784f09b563':
Import translations. DO NOT MERGE
0b76d2bd4565c991417a0fdfba18fc784f09b563 08-Jul-2015 Geoff Mendal <mendal@google.com> am 2a6441e3: (-s ours) am f8aeaac0: (-s ours) Import translations. DO NOT MERGE

* commit '2a6441e3e102f6b24c3442477b1933153905cdc7':
Import translations. DO NOT MERGE
065fb0d06fa29a3d44d001f9207d726235b8dc12 08-Jul-2015 Geoff Mendal <mendal@google.com> am f8aeaac0: (-s ours) Import translations. DO NOT MERGE

* commit 'f8aeaac0b896d832f1e9319f62cea4d082e60121':
Import translations. DO NOT MERGE
2a6441e3e102f6b24c3442477b1933153905cdc7 08-Jul-2015 Geoff Mendal <mendal@google.com> am f8aeaac0: (-s ours) Import translations. DO NOT MERGE

* commit 'f8aeaac0b896d832f1e9319f62cea4d082e60121':
Import translations. DO NOT MERGE
f8aeaac0b896d832f1e9319f62cea4d082e60121 08-Jul-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I63f1ed7adb06302e942d9440d243e8d86cc9bbdb
Auto-generated-cl: translation import
es/values-ca/strings.xml
es/values-es-rUS/strings.xml
es/values-fa/strings.xml
es/values-ms-rMY/strings.xml
es/values-ru/strings.xml
es/values-th/strings.xml
27d0650a511b182638be647937dc657e3e9e375c 08-Jul-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ia6fa015ad8e8d679da060be51fdf9e0502028717
Auto-generated-cl: translation import
es/values-ca/strings.xml
es/values-es-rUS/strings.xml
es/values-fa/strings.xml
es/values-ms-rMY/strings.xml
es/values-ru/strings.xml
es/values-th/strings.xml
98357d5f38e06c8fdaa55a7122e8a20e87ddbdab 06-Jul-2015 Geoff Mendal <mendal@google.com> am 22650cf2: (-s ours) am c636d71a: (-s ours) am 64f505ff: (-s ours) am 549def5e: (-s ours) am dc924634: (-s ours) Import translations. DO NOT MERGE

* commit '22650cf232a261ee8ceed89c1014f0de632add22':
Import translations. DO NOT MERGE
22650cf232a261ee8ceed89c1014f0de632add22 06-Jul-2015 Geoff Mendal <mendal@google.com> am c636d71a: (-s ours) am 64f505ff: (-s ours) am 549def5e: (-s ours) am dc924634: (-s ours) Import translations. DO NOT MERGE

* commit 'c636d71ae7af957026c0f45ec1180c5c3982541b':
Import translations. DO NOT MERGE
c636d71ae7af957026c0f45ec1180c5c3982541b 06-Jul-2015 Geoff Mendal <mendal@google.com> am 64f505ff: (-s ours) am 549def5e: (-s ours) am dc924634: (-s ours) Import translations. DO NOT MERGE

* commit '64f505ff91f77a3775665b41d9cd3a64fbcddaf6':
Import translations. DO NOT MERGE
64f505ff91f77a3775665b41d9cd3a64fbcddaf6 06-Jul-2015 Geoff Mendal <mendal@google.com> am 549def5e: (-s ours) am dc924634: (-s ours) Import translations. DO NOT MERGE

* commit '549def5ec6c95532fe6f381fd78b1c87ba59abf0':
Import translations. DO NOT MERGE
549def5ec6c95532fe6f381fd78b1c87ba59abf0 06-Jul-2015 Geoff Mendal <mendal@google.com> am dc924634: (-s ours) Import translations. DO NOT MERGE

* commit 'dc9246346db8450bc76de0711efe6c95d89475ba':
Import translations. DO NOT MERGE
e15fd1fc6b64108aa72f2da2902c0f5dddda0218 06-Jul-2015 Geoff Mendal <mendal@google.com> am dc924634: (-s ours) Import translations. DO NOT MERGE

* commit 'dc9246346db8450bc76de0711efe6c95d89475ba':
Import translations. DO NOT MERGE
dc9246346db8450bc76de0711efe6c95d89475ba 06-Jul-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ib99bca4410204d1c3b0a1e31f0f0e621c2b379e9
Auto-generated-cl: translation import
es/values-fi/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-sk/strings.xml
es/values-uz-rUZ/strings.xml
6794850fa858d1ee1a7c2eb7300f447ff47bbfe3 06-Jul-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I947008d9dd78023bb5720ba36b39e2b151c2c158
Auto-generated-cl: translation import
es/values-fi/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-sk/strings.xml
es/values-uz-rUZ/strings.xml
3dd22de4e07830cb3123d81ad1e2bdc7a39faff3 29-Jun-2015 Geoff Mendal <mendal@google.com> am 6f1fdadd: (-s ours) am 71eb6090: (-s ours) am 3e729c48: (-s ours) Import translations. DO NOT MERGE

* commit '6f1fdadd4b009a20bc552d023868a0928ea83afa':
Import translations. DO NOT MERGE
6f1fdadd4b009a20bc552d023868a0928ea83afa 29-Jun-2015 Geoff Mendal <mendal@google.com> am 71eb6090: (-s ours) am 3e729c48: (-s ours) Import translations. DO NOT MERGE

* commit '71eb60904abc94de6b17543cd322f20522e7507e':
Import translations. DO NOT MERGE
71eb60904abc94de6b17543cd322f20522e7507e 29-Jun-2015 Geoff Mendal <mendal@google.com> am 3e729c48: (-s ours) Import translations. DO NOT MERGE

* commit '3e729c4854ce80966c8bdad5e2461f5355ffb6d2':
Import translations. DO NOT MERGE
3e729c4854ce80966c8bdad5e2461f5355ffb6d2 29-Jun-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Idb4a750adf2cf2ac07f24be0358e2413603b447e
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
a2f39c98bdd7901e119b9eeb651f948774004669 29-Jun-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ibba19a9b3c9fa332e19f32b2363718c73002ab25
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
4ba2cb7f6c00bb9bc8a84236696c3609bdd6603f 24-Jun-2015 Jan Nordqvist <jannq@google.com> am 589eee36: am a7695dc9: am e30eb577: Merge "Fixed missing white-space." into mnc-dev

* commit '589eee365dd84f05ef4c7b8835491d6e1e1c6519':
Fixed missing white-space.
589eee365dd84f05ef4c7b8835491d6e1e1c6519 24-Jun-2015 Jan Nordqvist <jannq@google.com> am a7695dc9: am e30eb577: Merge "Fixed missing white-space." into mnc-dev

* commit 'a7695dc9d61eacd64fd8057dcfbd19f367cc3d97':
Fixed missing white-space.
a7695dc9d61eacd64fd8057dcfbd19f367cc3d97 24-Jun-2015 Jan Nordqvist <jannq@google.com> am e30eb577: Merge "Fixed missing white-space." into mnc-dev

* commit 'e30eb577fbb64efd7d63f418eb94baf83d49c5ad':
Fixed missing white-space.
9de5b82cc09ab4384f68e0bad45c283a37265da2 24-Jun-2015 Sanket Padawe <sanketpadawe@google.com> am ae60c5ae: am 1ada0c7a: am 3c797f7b: Merge "String changes for HS 2.0 dialogs." into mnc-dev

* commit 'ae60c5aeca4f7884d7dbcab0930291b98575a5dc':
String changes for HS 2.0 dialogs.
e30eb577fbb64efd7d63f418eb94baf83d49c5ad 24-Jun-2015 Jan Nordqvist <jannq@google.com> Merge "Fixed missing white-space." into mnc-dev
ae60c5aeca4f7884d7dbcab0930291b98575a5dc 24-Jun-2015 Sanket Padawe <sanketpadawe@google.com> am 1ada0c7a: am 3c797f7b: Merge "String changes for HS 2.0 dialogs." into mnc-dev

* commit '1ada0c7a62306ca963a7e751eba53268da1aff1b':
String changes for HS 2.0 dialogs.
1ada0c7a62306ca963a7e751eba53268da1aff1b 24-Jun-2015 Sanket Padawe <sanketpadawe@google.com> am 3c797f7b: Merge "String changes for HS 2.0 dialogs." into mnc-dev

* commit '3c797f7b1e32d953336487931e10dd3f87735ab5':
String changes for HS 2.0 dialogs.
3c797f7b1e32d953336487931e10dd3f87735ab5 24-Jun-2015 Sanket Padawe <sanketpadawe@google.com> Merge "String changes for HS 2.0 dialogs." into mnc-dev
a0771d0c78daa53031034af295ebd178fba22ef1 24-Jun-2015 Geoff Mendal <mendal@google.com> am aa3c4569: (-s ours) am bfacb3d2: (-s ours) am 4359b958: (-s ours) Import translations. DO NOT MERGE

* commit 'aa3c4569a2714becb806db6c1e3e241f58d288ed':
Import translations. DO NOT MERGE
aa3c4569a2714becb806db6c1e3e241f58d288ed 24-Jun-2015 Geoff Mendal <mendal@google.com> am bfacb3d2: (-s ours) am 4359b958: (-s ours) Import translations. DO NOT MERGE

* commit 'bfacb3d27f934e534f0cb5a1838fbc026109a0e9':
Import translations. DO NOT MERGE
bfacb3d27f934e534f0cb5a1838fbc026109a0e9 24-Jun-2015 Geoff Mendal <mendal@google.com> am 4359b958: (-s ours) Import translations. DO NOT MERGE

* commit '4359b95876bd4207fce0f2036252f2ccf8189eab':
Import translations. DO NOT MERGE
4359b95876bd4207fce0f2036252f2ccf8189eab 24-Jun-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I95eed9782d7a783e3f1d204ac0f5c3e2cd0e5520
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
6430bea0322cbcdfb95372af0eb05c9276865b53 24-Jun-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I6c1229db826b464ba782d470e942227f7016b254
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-az-rAZ/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
8a4df1e72274938dd90728301f267ccf400e4787 24-Jun-2015 Sanket Padawe <sanketpadawe@google.com> String changes for HS 2.0 dialogs.

Bug: 22010833
Change-Id: I1bdaac456236bae54f5c6d6a9ecdc718f9a8a198
es/values/strings.xml
e44e990b25d2d29062c9cb9cd160a6361f71e6fe 23-Jun-2015 Jan Nordqvist <jannq@google.com> Fixed missing white-space.

Change-Id: Ie2a5eb7367b79d6c38a2af7bddd82fbc5bee3a26
rc/com/android/certinstaller/WiFiInstaller.java
600cd934a05426f8c9da8d3bc5571474f5ffc390 23-Jun-2015 Sanket Padawe <sanketpadawe@google.com> am 94ea06e9: am 184ad01b: am 477d2ea4: Merge "Add dialog when installing HS 2.0 credentials while wifi is off." into mnc-dev

* commit '94ea06e9e5686ac6e18373551098555f285650dd':
Add dialog when installing HS 2.0 credentials while wifi is off.
ee52c12eda6e579adeea1405d656d96617c36989 23-Jun-2015 Jan Nordqvist <jannq@google.com> am 85869858: am 50071b7e: am 0694d5c4: Catching runtime exception in WifiInstaller.

* commit '858698582c117f29d8b525b8b9a83f248cd8c90e':
Catching runtime exception in WifiInstaller.
94ea06e9e5686ac6e18373551098555f285650dd 23-Jun-2015 Sanket Padawe <sanketpadawe@google.com> am 184ad01b: am 477d2ea4: Merge "Add dialog when installing HS 2.0 credentials while wifi is off." into mnc-dev

* commit '184ad01b5a043e34390bf9a7b28e25abd325be67':
Add dialog when installing HS 2.0 credentials while wifi is off.
858698582c117f29d8b525b8b9a83f248cd8c90e 23-Jun-2015 Jan Nordqvist <jannq@google.com> am 50071b7e: am 0694d5c4: Catching runtime exception in WifiInstaller.

* commit '50071b7e5a2dec607b6302d2966049207fd41250':
Catching runtime exception in WifiInstaller.
184ad01b5a043e34390bf9a7b28e25abd325be67 23-Jun-2015 Sanket Padawe <sanketpadawe@google.com> am 477d2ea4: Merge "Add dialog when installing HS 2.0 credentials while wifi is off." into mnc-dev

* commit '477d2ea4810dea406ffb285f778186e40e871018':
Add dialog when installing HS 2.0 credentials while wifi is off.
477d2ea4810dea406ffb285f778186e40e871018 23-Jun-2015 Sanket Padawe <sanketpadawe@google.com> Merge "Add dialog when installing HS 2.0 credentials while wifi is off." into mnc-dev
66177c3dfd449df65b3fdafdd2921c38c6385db4 23-Jun-2015 Sanket Padawe <sanketpadawe@google.com> Add dialog when installing HS 2.0 credentials while wifi is off.

Bug: 22010833
Change-Id: Ic59fbf7ec197bc4431508c7d1d495c047c0e20cc
ndroidManifest.xml
es/values/strings.xml
rc/com/android/certinstaller/CredentialsInstallDialog.java
rc/com/android/certinstaller/WiFiInstaller.java
50071b7e5a2dec607b6302d2966049207fd41250 23-Jun-2015 Jan Nordqvist <jannq@google.com> am 0694d5c4: Catching runtime exception in WifiInstaller.

* commit '0694d5c4498466208bb21df6197787a6c12c7fba':
Catching runtime exception in WifiInstaller.
0694d5c4498466208bb21df6197787a6c12c7fba 23-Jun-2015 Jan Nordqvist <jannq@google.com> Catching runtime exception in WifiInstaller.

Bug: 21958895
Change-Id: Ia483c9307e653e88d7d6050ef70963093f1b5f2b
rc/com/android/certinstaller/WiFiInstaller.java
fb09d952de8084daaf2e8dd11168fd58e8dbc45a 19-Jun-2015 Kenny Root <kroot@google.com> am 3ad5d930: am 7811b116: am cf819254: Fix RTL layout issue

* commit '3ad5d93062cbb1c001fd5d85432e30f78ad4da9b':
Fix RTL layout issue
3ad5d93062cbb1c001fd5d85432e30f78ad4da9b 19-Jun-2015 Kenny Root <kroot@google.com> am 7811b116: am cf819254: Fix RTL layout issue

* commit '7811b1168438dd0e667f5cfa01262860e2c2fcc7':
Fix RTL layout issue
c6253c631845acbd83db23c423bd598d97975ff3 19-Jun-2015 Kenny Root <kroot@google.com> am cfdc9316: am 6e7921c8: Merge "Fix RTL layout issue"

* commit 'cfdc931641bdf5cb4fadcbe525b5d78febcab953':
Fix RTL layout issue
cfdc931641bdf5cb4fadcbe525b5d78febcab953 19-Jun-2015 Kenny Root <kroot@google.com> am 6e7921c8: Merge "Fix RTL layout issue"

* commit '6e7921c87f3530407a81f2c5c995dd851d436b92':
Fix RTL layout issue
7811b1168438dd0e667f5cfa01262860e2c2fcc7 19-Jun-2015 Kenny Root <kroot@google.com> am cf819254: Fix RTL layout issue

* commit 'cf81925456d5d6ac5bce8f50fb2294de7a7246ca':
Fix RTL layout issue
cf81925456d5d6ac5bce8f50fb2294de7a7246ca 19-Jun-2015 Kenny Root <kroot@google.com> Fix RTL layout issue

The wrap_content directive was keeping the text confined to the left
side of the screen. Changing it to match_parent will allow it to span
the entire dialog.

(cherry picked from commit c4178d293ef609a9e3b045fa8e001e9e8179b868)

Bug: 21665076
Change-Id: I8506d99ff3e622281187c0bd32b41b4d509b4e24
es/layout/name_credential_dialog.xml
6e7921c87f3530407a81f2c5c995dd851d436b92 19-Jun-2015 Kenny Root <kroot@google.com> Merge "Fix RTL layout issue"
c4178d293ef609a9e3b045fa8e001e9e8179b868 19-Jun-2015 Kenny Root <kroot@google.com> Fix RTL layout issue

The wrap_content directive was keeping the text confined to the left
side of the screen. Changing it to match_parent will allow it to span
the entire dialog.

Bug: 21665076
Change-Id: I8506d99ff3e622281187c0bd32b41b4d509b4e24
es/layout/name_credential_dialog.xml
17a8953ae4a6513808e3613e1105cfb10981efb3 15-Jun-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I684bc9c6aa95fe0864464968c23935685b1e4a6c
Auto-generated-cl: translation import
es/values-es-rUS/strings.xml
es/values-fa/strings.xml
es/values-it/strings.xml
925826251ac632e9a04928b3aff19fe8bb9dedce 10-Jun-2015 Geoff Mendal <mendal@google.com> am 609b9660: (-s ours) am 763f7e44: (-s ours) am e110193e: (-s ours) Import translations. DO NOT MERGE

* commit '609b9660455aac42ff7fbf60c921ddde776836cf':
Import translations. DO NOT MERGE
609b9660455aac42ff7fbf60c921ddde776836cf 10-Jun-2015 Geoff Mendal <mendal@google.com> am 763f7e44: (-s ours) am e110193e: (-s ours) Import translations. DO NOT MERGE

* commit '763f7e446d33c8c4cbcfcc77fab704596e19dbdf':
Import translations. DO NOT MERGE
763f7e446d33c8c4cbcfcc77fab704596e19dbdf 10-Jun-2015 Geoff Mendal <mendal@google.com> am e110193e: (-s ours) Import translations. DO NOT MERGE

* commit 'e110193e399556dd1eb65a7cbca0df5b2346c9cf':
Import translations. DO NOT MERGE
e110193e399556dd1eb65a7cbca0df5b2346c9cf 10-Jun-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I5e89c377db1c6537ce81af707a409e1f1140e83e
Auto-generated-cl: translation import
es/values-nl/strings.xml
es/values-sk/strings.xml
es/values-uk/strings.xml
4d41a327ca1e0f551646abda0a65b0b1289ceef8 10-Jun-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I5686acac13ca43b78ff8b5aafc7b11f0f493b17a
Auto-generated-cl: translation import
es/values-nl/strings.xml
es/values-sk/strings.xml
es/values-uk/strings.xml
b26aca2ab830b268e2a0119f0dd2fe2148060200 08-Jun-2015 Geoff Mendal <mendal@google.com> am 601cb9ab: (-s ours) am 40f8d8b8: (-s ours) am 52eedebd: (-s ours) Import translations. DO NOT MERGE

* commit '601cb9ab2d0028c493c6da63d58ad941f264372e':
Import translations. DO NOT MERGE
601cb9ab2d0028c493c6da63d58ad941f264372e 08-Jun-2015 Geoff Mendal <mendal@google.com> am 40f8d8b8: (-s ours) am 52eedebd: (-s ours) Import translations. DO NOT MERGE

* commit '40f8d8b81ef5d40dc5625238e4e4b1112fd98efa':
Import translations. DO NOT MERGE
40f8d8b81ef5d40dc5625238e4e4b1112fd98efa 08-Jun-2015 Geoff Mendal <mendal@google.com> am 52eedebd: (-s ours) Import translations. DO NOT MERGE

* commit '52eedebd64090828bcd6427c1a9ece0dbafff446':
Import translations. DO NOT MERGE
52eedebd64090828bcd6427c1a9ece0dbafff446 08-Jun-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Id472734f2e8dca913055c92248a49638b0601983
Auto-generated-cl: translation import
es/values-bg/strings.xml
es/values-hr/strings.xml
es/values-kn-rIN/strings.xml
es/values-nb/strings.xml
es/values-ru/strings.xml
es/values-uz-rUZ/strings.xml
37644c0263bc9087f17aa6cb9f57753c00225c94 08-Jun-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Idce437c4abc4fa3900d5117f0f85be48613f1d16
Auto-generated-cl: translation import
es/values-bg/strings.xml
es/values-hr/strings.xml
es/values-kn-rIN/strings.xml
es/values-nb/strings.xml
es/values-ru/strings.xml
es/values-uz-rUZ/strings.xml
5fead039633a61a90b4d05f0e48db399b0f2d01d 04-Jun-2015 Vinit Deshpande <vinitd@google.com> am 456e0d1b: am 4a7bb6e6: am 614070af: Merge "am 756c09a..655de81 from mirror-m-wireless-internal-release" into mnc-dev

* commit '456e0d1ba36a0a1078070524e7bd1b9b4891e50e':
EXTRA_MIME_TYPES is String[], not Object[].
Removed some logging.
5bf7e1626840c037db5fdbd82dfdad3fb564579d 04-Jun-2015 Geoff Mendal <mendal@google.com> am fd3453fd: (-s ours) am 24f6495b: (-s ours) am d4b25db7: (-s ours) Import translations. DO NOT MERGE

* commit 'fd3453fd0c1fdeeb1a5f10e57a303de2fdf09809':
Import translations. DO NOT MERGE
456e0d1ba36a0a1078070524e7bd1b9b4891e50e 03-Jun-2015 Vinit Deshpande <vinitd@google.com> am 4a7bb6e6: am 614070af: Merge "am 756c09a..655de81 from mirror-m-wireless-internal-release" into mnc-dev

* commit '4a7bb6e6277536720e20dbcb7e2a5a4196b024c7':
EXTRA_MIME_TYPES is String[], not Object[].
Removed some logging.
4a7bb6e6277536720e20dbcb7e2a5a4196b024c7 03-Jun-2015 Vinit Deshpande <vinitd@google.com> am 614070af: Merge "am 756c09a..655de81 from mirror-m-wireless-internal-release" into mnc-dev

* commit '614070af9700216437783534416161717168cf7f':
EXTRA_MIME_TYPES is String[], not Object[].
Removed some logging.
614070af9700216437783534416161717168cf7f 03-Jun-2015 Vinit Deshpande <vinitd@google.com> Merge "am 756c09a..655de81 from mirror-m-wireless-internal-release" into mnc-dev
fd3453fd0c1fdeeb1a5f10e57a303de2fdf09809 03-Jun-2015 Geoff Mendal <mendal@google.com> am 24f6495b: (-s ours) am d4b25db7: (-s ours) Import translations. DO NOT MERGE

* commit '24f6495bbc9a8fb1e6301aae7e9ea73a1eecce26':
Import translations. DO NOT MERGE
24f6495bbc9a8fb1e6301aae7e9ea73a1eecce26 03-Jun-2015 Geoff Mendal <mendal@google.com> am d4b25db7: (-s ours) Import translations. DO NOT MERGE

* commit 'd4b25db7f5a37685427b4ca7629874e3e08a7ab8':
Import translations. DO NOT MERGE
d4b25db7f5a37685427b4ca7629874e3e08a7ab8 03-Jun-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ifa6273204f4584d73b9d803a4a0c131345579b72
Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
d048c54c948e5b1d8bc56692161e7a4e234c58f5 03-Jun-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I4192f730f598ba9f016ae793ff59ecc2015b5f00
Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
a1e4110e70501f98c05a4a3c3c2832f32c48607b 03-Jun-2015 Vinit Deshpande <vinitd@google.com> am 756c09a..655de81 from mirror-m-wireless-internal-release

655de81 EXTRA_MIME_TYPES is String[], not Object[].

Change-Id: I906d281e7f2a87be127aa281eb79098adbc66996
259cd1053d9107e94f90511b9d6159a884eec8d3 01-Jun-2015 Geoff Mendal <mendal@google.com> am 5f975547: (-s ours) am c33f931e: (-s ours) am db108c09: (-s ours) Import translations. DO NOT MERGE

* commit '5f975547a51fd84055eb89c780aa1b74eb30b1d7':
Import translations. DO NOT MERGE
5f975547a51fd84055eb89c780aa1b74eb30b1d7 01-Jun-2015 Geoff Mendal <mendal@google.com> am c33f931e: (-s ours) am db108c09: (-s ours) Import translations. DO NOT MERGE

* commit 'c33f931ec5436c761191f8632f6fd70548e55812':
Import translations. DO NOT MERGE
01a1502ef38d123f80a26cc40fbf56b2061a2a65 30-May-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I350724f8fdb1e1da722f52ac88176b84d45553d7
Auto-generated-cl: translation import
es/values-az-rAZ/strings.xml
c33f931ec5436c761191f8632f6fd70548e55812 29-May-2015 Geoff Mendal <mendal@google.com> am db108c09: (-s ours) Import translations. DO NOT MERGE

* commit 'db108c099a975a4d17224afe9b0025aaa384ddbb':
Import translations. DO NOT MERGE
db108c099a975a4d17224afe9b0025aaa384ddbb 29-May-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I53540f0727f34fdd9de14cc8e4dbede7eeab8d81
Auto-generated-cl: translation import
es/values-az-rAZ/strings.xml
575fef38aca4f13f8532f70f7bedb8c0a74837de 21-May-2015 Geoff Mendal <mendal@google.com> am 8148a4f0: (-s ours) am c03c37d9: (-s ours) am 63848d58: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '8148a4f0c7647e90069cbc140768ba4ea259a8b9':
Import translations. DO NOT MERGE
4d98ed57ac173dae4be90900d53ddab0ee11ccae 21-May-2015 Baligh Uddin <baligh@google.com> am b2c1dff0: (-s ours) am 43ad70d7: (-s ours) am ec0965df: (-s ours) Import translations. DO NOT MERGE

* commit 'b2c1dff0e9bfca55f0306f1781036ce8a187b602':
Import translations. DO NOT MERGE
8148a4f0c7647e90069cbc140768ba4ea259a8b9 21-May-2015 Geoff Mendal <mendal@google.com> am c03c37d9: (-s ours) am 63848d58: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'c03c37d9e2a193ebfd00c90a74a802e8dc2aa439':
Import translations. DO NOT MERGE
b2c1dff0e9bfca55f0306f1781036ce8a187b602 21-May-2015 Baligh Uddin <baligh@google.com> am 43ad70d7: (-s ours) am ec0965df: (-s ours) Import translations. DO NOT MERGE

* commit '43ad70d74a6583e7858667e003b9cef8803475a8':
Import translations. DO NOT MERGE
c03c37d9e2a193ebfd00c90a74a802e8dc2aa439 21-May-2015 Geoff Mendal <mendal@google.com> am 63848d58: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '63848d585d07f3738c961858bee159c2159b7a50':
Import translations. DO NOT MERGE
43ad70d74a6583e7858667e003b9cef8803475a8 21-May-2015 Baligh Uddin <baligh@google.com> am ec0965df: (-s ours) Import translations. DO NOT MERGE

* commit 'ec0965dfc2b64cd4d9bca305bf181cfeb3d47f8d':
Import translations. DO NOT MERGE
63848d585d07f3738c961858bee159c2159b7a50 21-May-2015 Geoff Mendal <mendal@google.com> Merge "Import translations. DO NOT MERGE" into mnc-dev
d300fb18da10ee8eb5820636e3bae7a8b010207d 21-May-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I51a694b52df33b3b5c12646d655d6f0c22de1950
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
39b747e52988b09ac3807ba6f30ca09d5e0f14a0 21-May-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ie5a32c8c773bda9fdd5580e4bcfaa473220ecbe8
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
ec0965dfc2b64cd4d9bca305bf181cfeb3d47f8d 21-May-2015 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I39679d266c77dd3e2e9b92863994079d51c1c84e
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
11db8c35de471f3722aa355b3cf1122657302bd8 14-May-2015 Geoff Mendal <mendal@google.com> am bc663d36: (-s ours) am 6bdb88db: (-s ours) am b3bba936: (-s ours) Import translations. DO NOT MERGE

* commit 'bc663d36657db9633264c6cccc954f0f234f7291':
Import translations. DO NOT MERGE
1b084a2dc5af7f1bde635332fd60c8ed74cb09ad 14-May-2015 Sanket Padawe <sanketpadawe@google.com> am 122def31: Hotspot 2.0 credential UI code

* commit '122def31973a25d878f33ce59288792aea27a32d':
Hotspot 2.0 credential UI code
bc663d36657db9633264c6cccc954f0f234f7291 14-May-2015 Geoff Mendal <mendal@google.com> am 6bdb88db: (-s ours) am b3bba936: (-s ours) Import translations. DO NOT MERGE

* commit '6bdb88db572211ae9763a7d911e11db39915189f':
Import translations. DO NOT MERGE
6bdb88db572211ae9763a7d911e11db39915189f 14-May-2015 Geoff Mendal <mendal@google.com> am b3bba936: (-s ours) Import translations. DO NOT MERGE

* commit 'b3bba9364924fc717eb3c80530f722db007571fc':
Import translations. DO NOT MERGE
b3bba9364924fc717eb3c80530f722db007571fc 14-May-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I02b0f9ebcba1cc5bd607764c758a1456a535bdcd
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-gu-rIN/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pa-rIN/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sq-rAL/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
122def31973a25d878f33ce59288792aea27a32d 14-May-2015 Sanket Padawe <sanketpadawe@google.com> Hotspot 2.0 credential UI code

Bug: 20182930
Change-Id: Iaac91833555f399acf8746ba11dd3007022205bd
ndroidManifest.xml
es/drawable/signal_wifi_4_bar_lock_black_24dp.png
es/layout/credentials_installed_dialog.xml
es/layout/wifi_detail_dialog.xml
es/layout/wifi_main_dialog.xml
es/values/strings.xml
es/values/styles.xml
rc/com/android/certinstaller/CredentialsInstallDialog.java
rc/com/android/certinstaller/WiFiInstaller.java
effe2ff670fdda98b264398d1838a4e19b5f6f00 13-May-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ibf58e8a36dd50d6cf200b06706d8e22a7779bc6c
Auto-generated-cl: translation import
es/values-uz-rUZ/strings.xml
655de814c465f4e20cfb122cf4c6d9a5670562aa 18-Apr-2015 Jeff Sharkey <jsharkey@android.com> EXTRA_MIME_TYPES is String[], not Object[].

Bug: 20299782
Change-Id: I532225717c913ecc340edfdfe8fc974c778d495b

Cherry pick from master.
b/20126912
rc/com/android/certinstaller/CertInstallerMain.java
e3e927970da18f655828b6faa2e6bb104d1326eb 11-May-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I362651a949e4af5e665e513850e3dc830488fe71
Auto-generated-cl: translation import
es/values-uz-rUZ/strings.xml
62d9c4356a79c4d1ddf0621c8707bd0141365b63 24-Apr-2015 Etan Cohen <etancohen@google.com> Merge commit '7c543b7' into merge2
756c09a808d0bc6cb3e4144a7c56b0391ef7ee11 24-Apr-2015 Jan Nordqvist <jannq@google.com> Removed some logging.

Change-Id: I946091ae1a1aecc34fc890564b9d98fe6d1872f1
rc/com/android/certinstaller/CertInstallerMain.java
rc/com/android/certinstaller/WiFiInstaller.java
b57c885d140be6346851e225cb783b41222bb215 22-Apr-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I4e453f9a78665bb1449dd2189beed4e23c86a2d9
Auto-generated-cl: translation import
es/values-gu-rIN/strings.xml
es/values-pa-rIN/strings.xml
es/values-sq-rAL/strings.xml
dddf16afa73d760adb51d8cda8cefaa6b20126cb 19-Apr-2015 Jeff Sharkey <jsharkey@android.com> Merge "EXTRA_MIME_TYPES is String[], not Object[]."
324ea236c2dfdc0593b0047eddf3a37dff1cb3fb 18-Apr-2015 Jeff Sharkey <jsharkey@android.com> EXTRA_MIME_TYPES is String[], not Object[].

Bug: 20299782
Change-Id: I532225717c913ecc340edfdfe8fc974c778d495b
rc/com/android/certinstaller/CertInstallerMain.java
6c1c1f5fb496ffafdabc1062cb4b325b1d1676ad 18-Apr-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I0af278cae3e41e7ceb8baef6f314592e2533a3b1
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ky-rKG/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zu/strings.xml
7c543b71d8b60d2e2885c361ef73481c8f1eb27f 17-Apr-2015 Jan Nordqvist <jannq@google.com> Changed logging tag.

Change-Id: Ibdfeed92805bde4cd7ac0a7ffdd239cb467cbbfd
rc/com/android/certinstaller/WiFiInstaller.java
8eca13babaafda875ad715c716371513002ed31e 16-Apr-2015 Jan Nordqvist <jannq@google.com> Launching PIN entry dialog if keystore access is required and the keystore is locked.

Change-Id: I723f741176fb776e8791bd4f838140d109139493
rc/com/android/certinstaller/WiFiInstaller.java
83626b16de0d09d5f5e91e0b823fd6c62a005673 15-Apr-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I12873c30ecfa366f05b535cbbcb3f19b51ff3221
Auto-generated-cl: translation import
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-et-rEE/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-mn-rMN/strings.xml
es/values-my-rMM/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-vi/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
c87f99bc94c2256ed53d2e91ea0d657f725ccfd8 13-Apr-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ib9f53385d42233ed9c8d7571061aaf8640499473
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-bn-rBD/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rAU/strings.xml
es/values-en-rGB/strings.xml
es/values-en-rIN/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et-rEE/strings.xml
es/values-eu-rES/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-fr/strings.xml
es/values-gl-rES/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-hy-rAM/strings.xml
es/values-in/strings.xml
es/values-is-rIS/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ka-rGE/strings.xml
es/values-kk-rKZ/strings.xml
es/values-km-rKH/strings.xml
es/values-kn-rIN/strings.xml
es/values-ko/strings.xml
es/values-ky-rKG/strings.xml
es/values-lo-rLA/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rIN/strings.xml
es/values-mn-rMN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ms-rMY/strings.xml
es/values-my-rMM/strings.xml
es/values-nb/strings.xml
es/values-ne-rNP/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-si-rLK/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
b16987ba229fb3f9f909514c8891e999816939a2 10-Apr-2015 Prerepa Viswanadham <dham@google.com> Merge commit '994932f1949316fe5520d6c690e6bd9b49b88ba6' into merge_work
994932f1949316fe5520d6c690e6bd9b49b88ba6 26-Mar-2015 Jan Nordqvist <jannq@google.com> Basic WiFi config installer app.

Change-Id: I12e26955f4057db7a1772eacfec6ce9fa58f4437
ndroidManifest.xml
es/layout/wifi_detail_dialog.xml
es/layout/wifi_main_dialog.xml
es/values/strings.xml
rc/com/android/certinstaller/CertInstallerMain.java
rc/com/android/certinstaller/WiFiInstaller.java
82e165522e72f1c40ca92eca37428d35769c5022 23-Mar-2015 Qiwen Zhao <zhao@google.com> am 2cdeebfc: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.

* commit '2cdeebfcbd45f09645954bd17811294b5623d036':
769ecd12c8cb5e8f24762ac15008c6cf1d2e95af 21-Mar-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I982bda5473ca100aea3524215606509e16afa98e
Auto-generated-cl: translation import
es/values-en-rAU/strings.xml
2cdeebfcbd45f09645954bd17811294b5623d036 21-Mar-2015 Qiwen Zhao <zhao@google.com> reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.
3fc90f328def68c6e68633dc06399ab99c74c614 21-Mar-2015 Sungsoo Lim <sungsoo@google.com> am 3a3dc8ed: am 37b6bfbf: am b34887b7: Fix build

* commit '3a3dc8edc527c137d0da696d02f6d1bad184c444':
9ad29e8203cb867bfb2c8723199ce67a3ff3c138 21-Mar-2015 Kenny Root <kroot@google.com> am adc020ad: am 63d761c0: am 2482baf7: am b3f3f024: am 9fa804c6: am 26e6becc: am 69506291: resolved conflicts for merge of 48d20b70 to klp-dev

* commit 'adc020ad25f0114d1fc5c4acba22a7debb09f0f8':
cc5314c48af06aeeb52bf8ee67060299b8e15ad7 21-Mar-2015 Baligh Uddin <baligh@google.com> am b53325dd: (-s ours) am 9cfc1802: (-s ours) am e9902377: (-s ours) Import translations. DO NOT MERGE

* commit 'b53325dd59a4f950151429fb43ff08cb8b9b8606':
7a57d04f9d177e64d99c5fa642b2623b879e2a93 21-Mar-2015 Baligh Uddin <baligh@google.com> am b99210ec: (-s ours) am 972e0bf1: (-s ours) am 2bd91860: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'b99210ecf2cc55abca94854d3a1f585c1cfdfa30':
9f6898066db1be84d10a722635ce1423c06067d6 21-Mar-2015 Baligh Uddin <baligh@google.com> am 4d88ea01: (-s ours) am c0d3b83f: (-s ours) am 0ede2b14: (-s ours) am 66f69041: (-s ours) am f9894e70: (-s ours) Import translations. DO NOT MERGE

* commit '4d88ea012b24a886e55a37e50edd5d9e4f574486':
744310291c86b93cda3ff5dbe29554cf86a9d4c0 21-Mar-2015 Baligh Uddin <baligh@google.com> am 7c83b80f: am b6616633: am 3201f961: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev

* commit '7c83b80ff04d909707e43c342249855c68370036':
7c78a3c4670531f059eb0dae0e71b01334e9f573 21-Mar-2015 Baligh Uddin <baligh@google.com> am 6a3b7621: (-s ours) am 06866e9b: (-s ours) am d0afe769: (-s ours) Import translations. DO NOT MERGE

* commit '6a3b7621de2aa4d549500c7090bf40b9d4630c71':
efdc3a4dcfca65a3ec3057d01596cb385c163818 16-Mar-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I623cf683237865194d3f3b0d79f3808a1f0cdd66
Auto-generated-cl: translation import
es/values-ro/strings.xml
8158f4ca8fda73b94aff64f7cf4ebb25b39732da 27-Feb-2015 Geoff Mendal <mendal@google.com> am 8757d6da: (-s ours) am 7581288f: (-s ours) Import translations. DO NOT MERGE

* commit '8757d6da1d70e1bcc3ddf85c3f3ed902210667cb':
Import translations. DO NOT MERGE
8757d6da1d70e1bcc3ddf85c3f3ed902210667cb 27-Feb-2015 Geoff Mendal <mendal@google.com> am 7581288f: (-s ours) Import translations. DO NOT MERGE

* commit '7581288ffafe0cf3807f31dfb763d2ee218a5c62':
Import translations. DO NOT MERGE
7581288ffafe0cf3807f31dfb763d2ee218a5c62 27-Feb-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ia16953b900badde1d443f5710ff9bfe961a09e68
Auto-generated-cl: translation import
es/values-hi/strings.xml
es/values-mr-rIN/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sl/strings.xml
es/values-ta-rIN/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
b9f03f37e94c5b2873c2f499520742c18ac6d1d5 13-Feb-2015 Geoff Mendal <mendal@google.com> am 025c6955: (-s ours) am 377d3f82: (-s ours) Import translations. DO NOT MERGE

* commit '025c6955c306014d5f27b941f04a090985c90283':
Import translations. DO NOT MERGE
025c6955c306014d5f27b941f04a090985c90283 13-Feb-2015 Geoff Mendal <mendal@google.com> am 377d3f82: (-s ours) Import translations. DO NOT MERGE

* commit '377d3f829fa4164b2beecb278ccbe43df80af0ad':
Import translations. DO NOT MERGE
377d3f829fa4164b2beecb278ccbe43df80af0ad 13-Feb-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ifd2d62a7562d840b18c5c1ff148dfcaa9b0c9185
Auto-generated-cl: translation import
es/values-hi/strings.xml
es/values-mr-rIN/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sl/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
ece1e490e8e6d58f87e5ac30342f3e0507bdec96 04-Feb-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I58f635ab1c918604ccd5262d6e75b5cc010a8991
Auto-generated-cl: translation import
es/values-tr/strings.xml
7e8014716d89b878bb421a3af56e42ec3d439a3d 28-Jan-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Icfa3db3980705cca1b23d8337f3dc9d34ad5e613
Auto-generated-cl: translation import
es/values-ru/strings.xml
195ef1d811e786087a3eefe376a23e3fbcd9757f 21-Jan-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ifa6225bf055d70fface229bcba857945aa92838e
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
d411b774ac4b042d703e3a0297ac572066b135c2 05-Jan-2015 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Icb11ec50b79c547b68b203002dd64b25712129e1
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
caa8c3b6211c94d8760723b3dce51eddcd5eaf7f 23-Dec-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I7cdafce2da957770f453ff13cce872ff889dc6df
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
2e8fc7588e53ab183a0d52c9493dc9025a818ccf 17-Nov-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Icac37c6de9f39e3dbbc81ef023e6f1dc44411e16
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
1adb1ceeefbb4d0e77ce02dc621203e395d7b6b0 13-Nov-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I9e77e9955ac5df5a4549ee4f443ad302f958901a
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
45bb09d9eed649cfe8e4dc32c9b312b7ee2dc0e5 10-Nov-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I06f5f08eeacf1ca0b4f8f304f2dc45037f97bfe8
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
c28870eb48ff8c9c3a5a79d49ead2902c6004f95 07-Nov-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I5c2dfddfe62efb9ae2aff1034d925ed164fae7b9
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
a25be0495338dce9650d61f3aa837799cc189453 31-Oct-2014 Baligh Uddin <baligh@google.com> am a4d78112: (-s ours) am b23c2e03: (-s ours) Import translations. DO NOT MERGE

* commit 'a4d78112aa6afbb9a26e7c283ec166495edbac71':
Import translations. DO NOT MERGE
a4d78112aa6afbb9a26e7c283ec166495edbac71 31-Oct-2014 Baligh Uddin <baligh@google.com> am b23c2e03: (-s ours) Import translations. DO NOT MERGE

* commit 'b23c2e03c27561369a98633c82227ee3a6014197':
Import translations. DO NOT MERGE
b23c2e03c27561369a98633c82227ee3a6014197 30-Oct-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ib5c6a9e774d4cd42a82690478858be65e9b2a230
Auto-generated-cl: translation import
es/values-hi/strings.xml
es/values-mr-rIN/strings.xml
es/values-pt/strings.xml
es/values-sl/strings.xml
es/values-ta-rIN/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rHK/strings.xml
d091490a5cc29121813109525ae78d099a622c90 28-Oct-2014 Baligh Uddin <baligh@google.com> am 7d69b744: (-s ours) am e18eacb9: (-s ours) am d48b66cd: (-s ours) Import translations. DO NOT MERGE

* commit '7d69b744d87130957993aac26f3658ae55d0657a':
b821c7a9a7ff17eea7f48d5baa34ca36d3bc83a3 28-Oct-2014 Kenny Root <kroot@android.com> am eff63cf7: am d5caf0c2: am d9ececef: Merge "Fix the bug on CertInstaller changing orientation"

* commit 'eff63cf7106a3fab985a310abe51adb182beeb46':
d8b023e158133b4a0efaf5f9bf06bfdd42b48d19 28-Oct-2014 Baligh Uddin <baligh@google.com> am c9da5bc7: (-s ours) am e1a63948: (-s ours) am 4b7effff: (-s ours) Import translations. DO NOT MERGE

* commit 'c9da5bc746247fddf6edb5571153c398d876394a':
03a970a2f99a9dcfc1f659276e681114b347e38c 28-Oct-2014 Baligh Uddin <baligh@google.com> am bbbdea6c: (-s ours) am 0dc7ebaf: (-s ours) am 197152d5: (-s ours) am fb3b6190: (-s ours) Import translations. DO NOT MERGE

* commit 'bbbdea6c30c36aa42cf1a2480b67d5aeda683013':
7d69b744d87130957993aac26f3658ae55d0657a 27-Oct-2014 Baligh Uddin <baligh@google.com> am e18eacb9: (-s ours) am d48b66cd: (-s ours) Import translations. DO NOT MERGE

* commit 'e18eacb9c99f0b656cbf853c109e45ac79dc3ccd':
eff63cf7106a3fab985a310abe51adb182beeb46 27-Oct-2014 Kenny Root <kroot@android.com> am d5caf0c2: am d9ececef: Merge "Fix the bug on CertInstaller changing orientation"

* commit 'd5caf0c28761970f4c4f62767c4071f0814ec655':
c9da5bc746247fddf6edb5571153c398d876394a 27-Oct-2014 Baligh Uddin <baligh@google.com> am e1a63948: (-s ours) am 4b7effff: (-s ours) Import translations. DO NOT MERGE

* commit 'e1a63948006e09f7e4cce382b79a44fedfe420af':
bbbdea6c30c36aa42cf1a2480b67d5aeda683013 27-Oct-2014 Baligh Uddin <baligh@google.com> am 0dc7ebaf: (-s ours) am 197152d5: (-s ours) am fb3b6190: (-s ours) Import translations. DO NOT MERGE

* commit '0dc7ebaff4725a5c926deade7ab261a114c339b7':
e2ebe32325118fcbfc0dd3f1ede4fe415367d089 20-Oct-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I0242d3a4b8aef32f657faf35d135dcebabe44b43
Auto-generated-cl: translation import
es/values-mr-rIN/strings.xml
es/values-my-rMM/strings.xml
es/values-sl/strings.xml
8c345e1fcd1f798ece10b9a30935d7dd7903db5d 20-Oct-2014 Baligh Uddin <baligh@google.com> am a88da342: (-s ours) am 1f4851d8: (-s ours) am 33c0a544: (-s ours) am cf188a52: (-s ours) am d48b66cd: (-s ours) Import translations. DO NOT MERGE

* commit 'a88da342b975793201ee263557b4c5740d6ad484':
Import translations. DO NOT MERGE
a88da342b975793201ee263557b4c5740d6ad484 20-Oct-2014 Baligh Uddin <baligh@google.com> am 1f4851d8: (-s ours) am 33c0a544: (-s ours) am cf188a52: (-s ours) am d48b66cd: (-s ours) Import translations. DO NOT MERGE

* commit '1f4851d834761826b8c338c6c27398f99f8460a2':
Import translations. DO NOT MERGE
1f4851d834761826b8c338c6c27398f99f8460a2 20-Oct-2014 Baligh Uddin <baligh@google.com> am 33c0a544: (-s ours) am cf188a52: (-s ours) am d48b66cd: (-s ours) Import translations. DO NOT MERGE

* commit '33c0a544f35937a5175e45dea1c71d37595c4d3f':
Import translations. DO NOT MERGE
33c0a544f35937a5175e45dea1c71d37595c4d3f 20-Oct-2014 Baligh Uddin <baligh@google.com> am cf188a52: (-s ours) am d48b66cd: (-s ours) Import translations. DO NOT MERGE

* commit 'cf188a522bbe43c5af0f7a3878b02eb37d1e8df8':
Import translations. DO NOT MERGE
cf188a522bbe43c5af0f7a3878b02eb37d1e8df8 20-Oct-2014 Baligh Uddin <baligh@google.com> am d48b66cd: (-s ours) Import translations. DO NOT MERGE

* commit 'd48b66cdec04ed54463dd7017af784e82aab7b4a':
Import translations. DO NOT MERGE
e18eacb9c99f0b656cbf853c109e45ac79dc3ccd 20-Oct-2014 Baligh Uddin <baligh@google.com> am d48b66cd: (-s ours) Import translations. DO NOT MERGE

* commit 'd48b66cdec04ed54463dd7017af784e82aab7b4a':
Import translations. DO NOT MERGE
d48b66cdec04ed54463dd7017af784e82aab7b4a 19-Oct-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Idc9c1b825391e533184cefc9442a118fff6da4b3
Auto-generated-cl: translation import
es/values-sl/strings.xml
445abd9ae621950a427d112b70d6854248fdddd1 16-Oct-2014 Kenny Root <kroot@android.com> am 4ef5667b: am d9ececef: Merge "Fix the bug on CertInstaller changing orientation"

* commit '4ef5667b853e086d53e9f600d06232f4516eb933':
Fix the bug on CertInstaller changing orientation
d5caf0c28761970f4c4f62767c4071f0814ec655 16-Oct-2014 Kenny Root <kroot@android.com> am d9ececef: Merge "Fix the bug on CertInstaller changing orientation"

* commit 'd9ececef2ffe2b86354a069b2fd34422dbb79b07':
Fix the bug on CertInstaller changing orientation
4ef5667b853e086d53e9f600d06232f4516eb933 16-Oct-2014 Kenny Root <kroot@android.com> am d9ececef: Merge "Fix the bug on CertInstaller changing orientation"

* commit 'd9ececef2ffe2b86354a069b2fd34422dbb79b07':
Fix the bug on CertInstaller changing orientation
d9ececef2ffe2b86354a069b2fd34422dbb79b07 16-Oct-2014 Kenny Root <kroot@android.com> Merge "Fix the bug on CertInstaller changing orientation"
c5af19888decbfc19788a30c2e70db8327184948 21-Feb-2014 seulhui.lee <seulhui.lee@lge.com> Fix the bug on CertInstaller changing orientation

User may think CertInstaller have a bug when he changing orientation in CertInstaller.
So, add android:configChanges attribute 'screenSize' on CertInstallerMain activity.

1) User is going to install certificate file using CertInstaller(Settings > Security > Install from storage).
2) User choose a certificate file via DocumentsContract(after KitKat MR1).
3) Password dialog is shown and user change orientation.
4) When orentation changing, CertInstallerMain activity is restarted.
New CertInstallerMain activity calls new DocumentsContract. But, old DocumentsContract is not destroyed.
Therefore, there are two DocumentsContract.
In this situation, User choose a certificate, he can't install certificate file(It just shows DocumentsContract),user think it is a bug.
So, 'screenSize' is necessary attribute on CertInstallerMain activity.

Signed-off-by : Seulhui Lee <seulhui.lee@lge.com>

Change-Id: I98826b3432a5794caf2b7bdb9e477606a788215b
80de88af70a75bd84fc8ff250fab65f392d312c8 13-Oct-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ieb633d5f92ea95c427118a6cdb91f30c518cbe81
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
79fa550c0c85bd15ca9191c268ae237e7e814378 07-Oct-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: Ifcdf1f16df3d899713c56822b2d15fb43149ba7b
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
23b87f289e40460eabc9e09466dcef0c2107f6cf 01-Oct-2014 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE"
229961189e8cca86327f40cff3b75f72fda135e7 30-Sep-2014 Baligh Uddin <baligh@google.com> am acd36959: (-s ours) am fbc97114: (-s ours) am 16571f41: (-s ours) am a13a813b: (-s ours) am 4b7effff: (-s ours) Import translations. DO NOT MERGE

* commit 'acd369597d04dcd6ba8b1dd31fec128bb159047e':
Import translations. DO NOT MERGE
acd369597d04dcd6ba8b1dd31fec128bb159047e 30-Sep-2014 Baligh Uddin <baligh@google.com> am fbc97114: (-s ours) am 16571f41: (-s ours) am a13a813b: (-s ours) am 4b7effff: (-s ours) Import translations. DO NOT MERGE

* commit 'fbc971146185df70e787eca5322751eab8614832':
Import translations. DO NOT MERGE
fbc971146185df70e787eca5322751eab8614832 30-Sep-2014 Baligh Uddin <baligh@google.com> am 16571f41: (-s ours) am a13a813b: (-s ours) am 4b7effff: (-s ours) Import translations. DO NOT MERGE

* commit '16571f416cedc282bf4fd7515efc57a7b6679b3e':
Import translations. DO NOT MERGE
16571f416cedc282bf4fd7515efc57a7b6679b3e 30-Sep-2014 Baligh Uddin <baligh@google.com> am a13a813b: (-s ours) am 4b7effff: (-s ours) Import translations. DO NOT MERGE

* commit 'a13a813bd04d626221a17e96bd9d213eaca3afa9':
Import translations. DO NOT MERGE
a13a813bd04d626221a17e96bd9d213eaca3afa9 30-Sep-2014 Baligh Uddin <baligh@google.com> am 4b7effff: (-s ours) Import translations. DO NOT MERGE

* commit '4b7effff047f63a00ae94fbb02e21056b2b0ea62':
Import translations. DO NOT MERGE
7784adb138565255cb4f49e385fdd3cd72155b5c 30-Sep-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ia940bce36ce6054c608a7ca81145db1099e5b635
Auto-generated-cl: translation import
es/values-hi/strings.xml
es/values-pt/strings.xml
es/values-zh-rCN/strings.xml
e1a63948006e09f7e4cce382b79a44fedfe420af 29-Sep-2014 Baligh Uddin <baligh@google.com> am 4b7effff: (-s ours) Import translations. DO NOT MERGE

* commit '4b7effff047f63a00ae94fbb02e21056b2b0ea62':
Import translations. DO NOT MERGE
4b7effff047f63a00ae94fbb02e21056b2b0ea62 29-Sep-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ic16fc3fb5c74141bf55d316ec354c4ecb98f8268
Auto-generated-cl: translation import
es/values-hi/strings.xml
es/values-pt/strings.xml
es/values-zh-rCN/strings.xml
7be7fa6618e1eba6cdb5aa6b979a1d9c457b27f8 21-Sep-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I1cc712535f8932fe117a14a6bd7fb8f10231baea
Auto-generated-cl: translation import
es/values-pt/strings.xml
7ced93f52e29f268d424edd878ad7a7b222b2515 19-Sep-2014 Baligh Uddin <baligh@google.com> am f040c2cd: (-s ours) am 0a681c3f: (-s ours) am b73835c3: (-s ours) am 56611958: (-s ours) am fb3b6190: (-s ours) Import translations. DO NOT MERGE

* commit 'f040c2cdbd8eb8ea316a35fd47242e0d121f053c':
8aa0e5b6a98b372ba6f5421838b1b1f7989a39a6 18-Sep-2014 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE"
cbbf722eb688abf45946107a4f4689b8596c854e 16-Sep-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I0977e0dc7472dc35a2ab2ca07843241ec4c7064e
Auto-generated-cl: translation import
es/values-hi/strings.xml
es/values-zh-rHK/strings.xml
f040c2cdbd8eb8ea316a35fd47242e0d121f053c 16-Sep-2014 Baligh Uddin <baligh@google.com> am 0a681c3f: (-s ours) am b73835c3: (-s ours) am 56611958: (-s ours) am fb3b6190: (-s ours) Import translations. DO NOT MERGE

* commit '0a681c3fb93ff91bf447c4193dfb04f21ae495ab':
Import translations. DO NOT MERGE
eacf4073de79ba6f38a931fccbf25dda9d42d466 16-Sep-2014 Baligh Uddin <baligh@google.com> am 0dc7ebaf: (-s ours) am 197152d5: (-s ours) am fb3b6190: (-s ours) Import translations. DO NOT MERGE

* commit '0dc7ebaff4725a5c926deade7ab261a114c339b7':
Import translations. DO NOT MERGE
0dc7ebaff4725a5c926deade7ab261a114c339b7 16-Sep-2014 Baligh Uddin <baligh@google.com> am 197152d5: (-s ours) am fb3b6190: (-s ours) Import translations. DO NOT MERGE

* commit '197152d57c29494146abe7d05b76335be761c18c':
Import translations. DO NOT MERGE
0a681c3fb93ff91bf447c4193dfb04f21ae495ab 16-Sep-2014 Baligh Uddin <baligh@google.com> am b73835c3: (-s ours) am 56611958: (-s ours) am fb3b6190: (-s ours) Import translations. DO NOT MERGE

* commit 'b73835c3a2c15b07b5482a7bfc068e908a5249dd':
Import translations. DO NOT MERGE
b73835c3a2c15b07b5482a7bfc068e908a5249dd 16-Sep-2014 Baligh Uddin <baligh@google.com> am 56611958: (-s ours) am fb3b6190: (-s ours) Import translations. DO NOT MERGE

* commit '566119583656568b2914570d822c6477db7c739c':
Import translations. DO NOT MERGE
566119583656568b2914570d822c6477db7c739c 16-Sep-2014 Baligh Uddin <baligh@google.com> am fb3b6190: (-s ours) Import translations. DO NOT MERGE

* commit 'fb3b619032f4d1d1a84b54fa8b155100b6727828':
Import translations. DO NOT MERGE
197152d57c29494146abe7d05b76335be761c18c 16-Sep-2014 Baligh Uddin <baligh@google.com> am fb3b6190: (-s ours) Import translations. DO NOT MERGE

* commit 'fb3b619032f4d1d1a84b54fa8b155100b6727828':
Import translations. DO NOT MERGE
fb3b619032f4d1d1a84b54fa8b155100b6727828 15-Sep-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I794a6a0e15803c24dab90f8d73399dfd656f2476
Auto-generated-cl: translation import
es/values-hi/strings.xml
es/values-zh-rHK/strings.xml
e4c1f3694cc64412a7527a2419511dd3fe155437 11-Sep-2014 Sungsoo Lim <sungsoo@google.com> am 3a3dc8ed: am 37b6bfbf: am b34887b7: Fix build

* commit '3a3dc8edc527c137d0da696d02f6d1bad184c444':
Fix build
a47ca40aca41277e4f38cddaeed8347981beb61c 11-Sep-2014 Kenny Root <kroot@google.com> am adc020ad: am 63d761c0: am 2482baf7: am b3f3f024: am 9fa804c6: am 26e6becc: am 69506291: resolved conflicts for merge of 48d20b70 to klp-dev

* commit 'adc020ad25f0114d1fc5c4acba22a7debb09f0f8':
Check component class instead of action
3a3dc8edc527c137d0da696d02f6d1bad184c444 11-Sep-2014 Sungsoo Lim <sungsoo@google.com> am 37b6bfbf: am b34887b7: Fix build

* commit '37b6bfbf8b4be2dcbe0d8cad7dee0239594e9156':
Fix build
37b6bfbf8b4be2dcbe0d8cad7dee0239594e9156 11-Sep-2014 Sungsoo Lim <sungsoo@google.com> am b34887b7: Fix build

* commit 'b34887b7eea710fe6897e6e4f4f1994c710c9ad3':
Fix build
b34887b7eea710fe6897e6e4f4f1994c710c9ad3 11-Sep-2014 Sungsoo Lim <sungsoo@google.com> Fix build

Change-Id: Idf9385e3f4f844fabd795fc634740f929497a19b
rc/com/android/certinstaller/CertInstallerMain.java
adc020ad25f0114d1fc5c4acba22a7debb09f0f8 11-Sep-2014 Kenny Root <kroot@google.com> am 63d761c0: am 2482baf7: am b3f3f024: am 9fa804c6: am 26e6becc: am 69506291: resolved conflicts for merge of 48d20b70 to klp-dev

* commit '63d761c0ca7000d6f9f495b84069e54c5272e688':
Check component class instead of action
63d761c0ca7000d6f9f495b84069e54c5272e688 11-Sep-2014 Kenny Root <kroot@google.com> am 2482baf7: am b3f3f024: am 9fa804c6: am 26e6becc: am 69506291: resolved conflicts for merge of 48d20b70 to klp-dev

* commit '2482baf745fb3cd9aca6aff8b29fe13adde622e5':
Check component class instead of action
2482baf745fb3cd9aca6aff8b29fe13adde622e5 11-Sep-2014 Kenny Root <kroot@google.com> am b3f3f024: am 9fa804c6: am 26e6becc: am 69506291: resolved conflicts for merge of 48d20b70 to klp-dev

* commit 'b3f3f024fc092114421e70b5b0f40c49d586fd48':
Check component class instead of action
b3f3f024fc092114421e70b5b0f40c49d586fd48 11-Sep-2014 Kenny Root <kroot@google.com> am 9fa804c6: am 26e6becc: am 69506291: resolved conflicts for merge of 48d20b70 to klp-dev

* commit '9fa804c60ad9e91ea2296e1acf326f46189f362b':
Check component class instead of action
9fa804c60ad9e91ea2296e1acf326f46189f362b 11-Sep-2014 Kenny Root <kroot@google.com> am 26e6becc: am 69506291: resolved conflicts for merge of 48d20b70 to klp-dev

* commit '26e6beccf2cc3619e6108bbe25b01692b4dc9c8c':
Check component class instead of action
26e6beccf2cc3619e6108bbe25b01692b4dc9c8c 11-Sep-2014 Kenny Root <kroot@google.com> am 69506291: resolved conflicts for merge of 48d20b70 to klp-dev

* commit '695062916d4fdc01efbf7e4e925ff1fea636f8c3':
Check component class instead of action
695062916d4fdc01efbf7e4e925ff1fea636f8c3 11-Sep-2014 Kenny Root <kroot@google.com> resolved conflicts for merge of 48d20b70 to klp-dev

Change-Id: Ie07b8ef90a2447f26cdef5b30169793416bfbc0c
48d20b70622a75a059a262163008ccec159751cd 10-Sep-2014 Kenny Root <kroot@google.com> am 5aac5317: Check component class instead of action

* commit '5aac53173509f394e67acd75b98c4d0731c86f76':
Check component class instead of action
715ad1a033f30cc70ba5fee7395166f15d354921 26-Aug-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I64a090bb7f5403480147a0c105b60f919667ea9d
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
8b3f072833969690fcd8233d76f65718140361fc 25-Aug-2014 Baligh Uddin <baligh@google.com> am b53325dd: (-s ours) am 9cfc1802: (-s ours) am e9902377: (-s ours) Import translations. DO NOT MERGE

* commit 'b53325dd59a4f950151429fb43ff08cb8b9b8606':
Import translations. DO NOT MERGE
b53325dd59a4f950151429fb43ff08cb8b9b8606 25-Aug-2014 Baligh Uddin <baligh@google.com> am 9cfc1802: (-s ours) am e9902377: (-s ours) Import translations. DO NOT MERGE

* commit '9cfc18022d8b06fe7cb83cdd915db730b9274b8c':
Import translations. DO NOT MERGE
9cfc18022d8b06fe7cb83cdd915db730b9274b8c 25-Aug-2014 Baligh Uddin <baligh@google.com> am e9902377: (-s ours) Import translations. DO NOT MERGE

* commit 'e9902377baf83e710f7b0ff89e7b2b245fb21874':
Import translations. DO NOT MERGE
e9902377baf83e710f7b0ff89e7b2b245fb21874 24-Aug-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I0f3119b8296987bb93630901d447fe69e9af43f3
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
98f74fb802a6504cd2fa02216bb4ab77bb6620e9 18-Aug-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I448a094aff0f81ccd58cb4b7e27694c6c7624107
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
5cf8776920f00e531fd50ee442d1f8b18065302f 17-Aug-2014 Baligh Uddin <baligh@google.com> am b99210ec: (-s ours) am 972e0bf1: (-s ours) am 2bd91860: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'b99210ecf2cc55abca94854d3a1f585c1cfdfa30':
Import translations. DO NOT MERGE
b99210ecf2cc55abca94854d3a1f585c1cfdfa30 17-Aug-2014 Baligh Uddin <baligh@google.com> am 972e0bf1: (-s ours) am 2bd91860: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '972e0bf15e268db539208f30bc3b8f274dc7fc1c':
Import translations. DO NOT MERGE
972e0bf15e268db539208f30bc3b8f274dc7fc1c 17-Aug-2014 Baligh Uddin <baligh@google.com> am 2bd91860: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '2bd918600164cbfcdc0e6245aa46c8a19678694c':
Import translations. DO NOT MERGE
018aab4dc4d6f77396986d81768f5c58ae81558a 16-Aug-2014 Baligh Uddin <baligh@google.com> am 4d88ea01: (-s ours) am c0d3b83f: (-s ours) am 0ede2b14: (-s ours) am 66f69041: (-s ours) am f9894e70: (-s ours) Import translations. DO NOT MERGE

* commit '4d88ea012b24a886e55a37e50edd5d9e4f574486':
Import translations. DO NOT MERGE
4d88ea012b24a886e55a37e50edd5d9e4f574486 16-Aug-2014 Baligh Uddin <baligh@google.com> am c0d3b83f: (-s ours) am 0ede2b14: (-s ours) am 66f69041: (-s ours) am f9894e70: (-s ours) Import translations. DO NOT MERGE

* commit 'c0d3b83f517eb925d39c08220e7de58a4168d469':
Import translations. DO NOT MERGE
c0d3b83f517eb925d39c08220e7de58a4168d469 16-Aug-2014 Baligh Uddin <baligh@google.com> am 0ede2b14: (-s ours) am 66f69041: (-s ours) am f9894e70: (-s ours) Import translations. DO NOT MERGE

* commit '0ede2b14d9415d9a9364ee69faa86dfe124575d5':
Import translations. DO NOT MERGE
0ede2b14d9415d9a9364ee69faa86dfe124575d5 16-Aug-2014 Baligh Uddin <baligh@google.com> am 66f69041: (-s ours) am f9894e70: (-s ours) Import translations. DO NOT MERGE

* commit '66f69041c76a4ab445afdd60c9481ba177fe4160':
Import translations. DO NOT MERGE
2bd918600164cbfcdc0e6245aa46c8a19678694c 17-Aug-2014 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE" into lmp-dev
1601d7ffb92c590eecc1a0f544acafcc7ade8f8a 16-Aug-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I4c524b6ec330d1f76c1d15a376a8e5acf87d8377
Auto-generated-cl: translation import
es/values-hi/strings.xml
es/values-my-rMM/strings.xml
es/values-zh-rCN/strings.xml
66f69041c76a4ab445afdd60c9481ba177fe4160 16-Aug-2014 Baligh Uddin <baligh@google.com> am f9894e70: (-s ours) Import translations. DO NOT MERGE

* commit 'f9894e7063701007a3611664a917f9144205abb8':
Import translations. DO NOT MERGE
f9894e7063701007a3611664a917f9144205abb8 15-Aug-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I744b9d79dabbaa3a38cc3a2f16e611b5ff8be745
Auto-generated-cl: translation import
es/values-hi/strings.xml
es/values-zh-rCN/strings.xml
647b0dbe0270ab09ce9b71fc2e5671054d6b507b 11-Aug-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I62531d895fcad14d1cee78b90633e1b394872e32
Auto-generated-cl: translation import
es/values-my-rMM/strings.xml
e4bd329e81235a8a0a7bdfa4ba8cc051731139b3 30-Jul-2014 Geoff Mendal <mendal@google.com> Import translations. DO NOT MERGE

Change-Id: I08b30ae451c97eaaabf1599d818f3d0fa663b5d2
Auto-generated-cl: translation import
es/values-hi/strings.xml
es/values-my-rMM/strings.xml
es/values-zh-rCN/strings.xml
13160bf25a98b8da6dfe381a6001dbbb56b36c26 21-Jul-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I6e1b2ec82217a7724cb150a98484fe1d96d5a049
Auto-generated-cl: translation import
es/values-ta-rIN/strings.xml
722efb8efc7ea679eebdfb20d718b81147a8ef57 21-Jul-2014 Baligh Uddin <baligh@google.com> am 7c83b80f: (-s ours) am b6616633: am 3201f961: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev

* commit '7c83b80ff04d909707e43c342249855c68370036':
Remove deprecated locales - DO NOT MERGE
41a600806f8d04198f2ef11268ad8a1bd19e9c46 21-Jul-2014 Baligh Uddin <baligh@google.com> am 6a3b7621: (-s ours) am 06866e9b: (-s ours) am d0afe769: (-s ours) Import translations. DO NOT MERGE

* commit '6a3b7621de2aa4d549500c7090bf40b9d4630c71':
Import translations. DO NOT MERGE
7c83b80ff04d909707e43c342249855c68370036 20-Jul-2014 Baligh Uddin <baligh@google.com> am b6616633: am 3201f961: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev

* commit 'b661663305ce74f4f303dea4a984f815e2be829e':
Remove deprecated locales - DO NOT MERGE
6a3b7621de2aa4d549500c7090bf40b9d4630c71 20-Jul-2014 Baligh Uddin <baligh@google.com> am 06866e9b: (-s ours) am d0afe769: (-s ours) Import translations. DO NOT MERGE

* commit '06866e9b7015486ecdaf5f18279952ce0a62f8b6':
Import translations. DO NOT MERGE
b661663305ce74f4f303dea4a984f815e2be829e 20-Jul-2014 Baligh Uddin <baligh@google.com> am 3201f961: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev

* commit '3201f961fbb2783c202b5e17d609daeab836a45e':
Remove deprecated locales - DO NOT MERGE
06866e9b7015486ecdaf5f18279952ce0a62f8b6 19-Jul-2014 Baligh Uddin <baligh@google.com> am d0afe769: (-s ours) Import translations. DO NOT MERGE

* commit 'd0afe769b33f0cdb283553540426f8b854b71108':
Import translations. DO NOT MERGE
5de122fb52cc636ec5aa01c7741f1682893a8139 18-Jul-2014 Baligh Uddin <baligh@google.com> Remove deprecated locales

Change-Id: I9cb44c6b8704312c03177c0183ce9b33e1e63eca
es/values-az/strings.xml
es/values-ne/strings.xml
es/values-si/strings.xml
d0afe769b33f0cdb283553540426f8b854b71108 18-Jul-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I9820e752c85147939f9d4cc6192473672dd9474c
Auto-generated-cl: translation import
es/values-ta-rIN/strings.xml
9c2ef5104e724bc45f9a4e9c0f5cf8d3f4c34402 18-Jul-2014 Baligh Uddin <baligh@google.com> Remove deprecated locales

Change-Id: I5b3ceac3fcbff719aaba96a8d2ca36e496b69f6d
es/values-bn-rWB/strings.xml
es/values-eu-rPV/strings.xml
es/values-gl-rGA/strings.xml
es/values-kn-rKA/strings.xml
es/values-ml-rKL/strings.xml
es/values-mr-rMH/strings.xml
es/values-rm/strings.xml
es/values-ta-rTN/strings.xml
es/values-te-rAP/strings.xml
3201f961fbb2783c202b5e17d609daeab836a45e 20-Jul-2014 Baligh Uddin <baligh@google.com> Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev
eab514f00f82f59058567302c33561c0284bbd08 19-Jul-2014 Baligh Uddin <baligh@google.com> Remove deprecated locales - DO NOT MERGE

Change-Id: I9183c60ca6936791fd146a90347fa3fe1c75820f
es/values-az/strings.xml
es/values-bn-rWB/strings.xml
es/values-eu-rPV/strings.xml
es/values-gl-rGA/strings.xml
es/values-kn-rKA/strings.xml
es/values-ml-rKL/strings.xml
es/values-mr-rMH/strings.xml
es/values-ne/strings.xml
es/values-rm/strings.xml
es/values-si/strings.xml
es/values-ta-rTN/strings.xml
es/values-te-rAP/strings.xml
7c283040f39a89bc3cee0cd2e14bc71cecf228dd 06-Jul-2014 Baligh Uddin <baligh@google.com> am c05e175e: (-s ours) am 9a7dc69c: (-s ours) am 0b4c1a08: (-s ours) am 779301f3: (-s ours) Import translations. DO NOT MERGE

* commit 'c05e175e08b1aeed752e341e867dafff1f880a44':
Import translations. DO NOT MERGE
703da0ef82dad0bddb53db59dbb40b21a21decbc 06-Jul-2014 Baligh Uddin <baligh@google.com> am fd95f033: (-s ours) am e5e9552d: (-s ours) am dbed01b4: (-s ours) Import translations. DO NOT MERGE

* commit 'fd95f033ad4ed9099b112bcbd4da9b4a2ffcc483':
Import translations. DO NOT MERGE
c05e175e08b1aeed752e341e867dafff1f880a44 06-Jul-2014 Baligh Uddin <baligh@google.com> am 9a7dc69c: (-s ours) am 0b4c1a08: (-s ours) am 779301f3: (-s ours) Import translations. DO NOT MERGE

* commit '9a7dc69c8f372edb3946d512a2401b17b83a9c45':
Import translations. DO NOT MERGE
fd95f033ad4ed9099b112bcbd4da9b4a2ffcc483 06-Jul-2014 Baligh Uddin <baligh@google.com> am e5e9552d: (-s ours) am dbed01b4: (-s ours) Import translations. DO NOT MERGE

* commit 'e5e9552d02a55a9c40740ab82680cddba986c599':
Import translations. DO NOT MERGE
9a7dc69c8f372edb3946d512a2401b17b83a9c45 06-Jul-2014 Baligh Uddin <baligh@google.com> am 0b4c1a08: (-s ours) am 779301f3: (-s ours) Import translations. DO NOT MERGE

* commit '0b4c1a083b632d1c2ffa7f70046d78b4b0baec11':
Import translations. DO NOT MERGE
e5e9552d02a55a9c40740ab82680cddba986c599 06-Jul-2014 Baligh Uddin <baligh@google.com> am dbed01b4: (-s ours) Import translations. DO NOT MERGE

* commit 'dbed01b46b042f46f6bc0892ec1b706a4f1d916e':
Import translations. DO NOT MERGE
0b4c1a083b632d1c2ffa7f70046d78b4b0baec11 06-Jul-2014 Baligh Uddin <baligh@google.com> am 779301f3: (-s ours) Import translations. DO NOT MERGE

* commit '779301f35bdc0688119942b4297817831f57656e':
Import translations. DO NOT MERGE
e8f21007e0928dcd136650400b1599ce2ac5eb7f 06-Jul-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I74ba2cf37cc2b7f524cd8f757bd5706f0041263a
Auto-generated-cl: translation import
es/values-bn-rBD/strings.xml
es/values-eu-rES/strings.xml
es/values-gl-rES/strings.xml
es/values-kn-rIN/strings.xml
es/values-ml-rIN/strings.xml
es/values-mr-rIN/strings.xml
es/values-ta-rIN/strings.xml
es/values-te-rIN/strings.xml
dbed01b46b042f46f6bc0892ec1b706a4f1d916e 06-Jul-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ie00bf8a6786d7b2a61d1f6615ffc687a7a86bfe5
Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-hi/strings.xml
es/values-iw/strings.xml
es/values-th/strings.xml
779301f35bdc0688119942b4297817831f57656e 06-Jul-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I0e756a613224aaa420189afae311f03b7ecc645c
Auto-generated-cl: translation import
es/values-fi/strings.xml
es/values-th/strings.xml
e6a77a43b7f54cb4a869f3db99335c752eee4d13 30-Jun-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ic9e8c7683338d8b3c25b589438f833e10b31951a
Auto-generated-cl: translation import
es/values-bn-rWB/strings.xml
es/values-eu-rPV/strings.xml
es/values-gl-rGA/strings.xml
es/values-is-rIS/strings.xml
es/values-kk-rKZ/strings.xml
es/values-kn-rKA/strings.xml
es/values-ky-rKG/strings.xml
es/values-mk-rMK/strings.xml
es/values-ml-rKL/strings.xml
es/values-mr-rMH/strings.xml
es/values-my-rMM/strings.xml
es/values-ne-rNP/strings.xml
es/values-ta-rTN/strings.xml
es/values-te-rAP/strings.xml
es/values-ur-rPK/strings.xml
es/values-uz-rUZ/strings.xml
19d80c1b3e5410202e94884db0a76fc8f9574c57 19-Jun-2014 Julia Reynolds <juliacr@google.com> Merge "Block certificate installation if user restriction enabled."
5aac53173509f394e67acd75b98c4d0731c86f76 08-May-2014 Kenny Root <kroot@google.com> Check component class instead of action

Ensure the called intent was filtered for permission by
ActivityManagerService by checking the ComponentName instead of the
action.

(cherry picked from commit 38a956408f45c9a7cbb48b79c67257b9207fda30)

Bug: 14441285
Change-Id: I3a848ef2375ddfa7c9b35389524419993a6b3693
rc/com/android/certinstaller/CertInstallerMain.java
b7fe475f26f62a2d6d846922a0ff3ea8f823d735 12-Jun-2014 Julia Reynolds <juliacr@google.com> Block certificate installation if user restriction enabled.

Bug: 14081992
Change-Id: Ic7f04cc3555144512ca100b31d77ddec15e28546
rc/com/android/certinstaller/CertInstallerMain.java
38a956408f45c9a7cbb48b79c67257b9207fda30 08-May-2014 Kenny Root <kroot@google.com> Check component class instead of action

Ensure the called intent was filtered for permission by
ActivityManagerService by checking the ComponentName instead of the
action.

Bug: 14441285
Change-Id: I3a848ef2375ddfa7c9b35389524419993a6b3693
rc/com/android/certinstaller/CertInstallerMain.java
ddceb3264ca51c2e46a449264f5bc451705eb990 23-Apr-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: If02bc8b68bd3d377b62548924dfabfe20bab3f1f
Auto-generated-cl: translation import
es/values-th/strings.xml
c5325503da230173ec0f26f1f5db93722c500470 23-Apr-2014 Baligh Uddin <baligh@google.com> am e78671c5: (-s ours) am af8d8bb2: (-s ours) Import translations. DO NOT MERGE

* commit 'e78671c5d43da4984673a17b02614d79854c4551':
Import translations. DO NOT MERGE
e78671c5d43da4984673a17b02614d79854c4551 23-Apr-2014 Baligh Uddin <baligh@google.com> am af8d8bb2: (-s ours) Import translations. DO NOT MERGE

* commit 'af8d8bb272307158fab272e78fc7088ae2d5f813':
Import translations. DO NOT MERGE
af8d8bb272307158fab272e78fc7088ae2d5f813 23-Apr-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I8bab1b65b1964b9d0b8dc522b2d6ebab1ab668c5
Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-en-rIN/strings.xml
es/values-et-rEE/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr-rCA/strings.xml
es/values-hi/strings.xml
es/values-hy-rAM/strings.xml
es/values-iw/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-lo-rLA/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-th/strings.xml
es/values-zh-rHK/strings.xml
b0522240f481c57aea3aff3d4744e19c711e0786 22-Apr-2014 Kenny Root <kroot@android.com> am 483a188f: Merge "Prevent CertInstallerMain from being recreated upon screenSize change"

* commit '483a188feda6e9d311aef437d28f30e1fb6afeb0':
Prevent CertInstallerMain from being recreated upon screenSize change
483a188feda6e9d311aef437d28f30e1fb6afeb0 22-Apr-2014 Kenny Root <kroot@android.com> Merge "Prevent CertInstallerMain from being recreated upon screenSize change"
b010ba91aad2910fe670d9e679beb5f31cfc7a2d 17-Apr-2014 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Iffab8f04950afdee8a2368e00cfa5576f7d09b6e
Auto-generated-cl: translation import
es/values-fi/strings.xml
e474207f4b075d17912d4316974ff628efad60ac 07-Jan-2014 hanpengx <pengfeix.han@intel.com> Prevent CertInstallerMain from being recreated upon screenSize change

Steps to Reproduce on Nexus 10:
1.Enter Settings app->Wi-Fi.
2.Tap options menu and select "Advanced" item.
3.Tap "Install certificates" item.
4.Rotate the device.
5.Two instances of DocumentsActivity will be created.

In step 3, Settings app will start CertInstallerMain Activity(invisible)
when user want to install certificates, then CertInstallerMain
will start DocumentsActivity with action Intent.ACTION_OPEN_DOCUMENT to
open document in its onCreate() method. When user rotate the screen, the
configuration screenSize will change, then the CertInstallerMain
will be destroyed and recreated, the DocumentsActivity will be created
again in onCreate() method of CertInstallerMain.

Change-Id: I0d31b9936aa158afbea6f426b5216fad50e6b237
Signed-off-by: hanpengx <pengfeix.han@intel.com>
Signed-off-by: Guobin Zhang <guobin.zhang@intel.com>
ndroidManifest.xml
1469bf5b7b2405510151463ad463c560e5b9762a 09-Dec-2013 Baligh Uddin <baligh@google.com> Remove deprecated locales


Bug:11340849

Change-Id: I1d4673d3ef338d01687d77262b4ceaa8f1406d79
es/values-be/strings.xml
es/values-et/strings.xml
es/values-hy/strings.xml
es/values-ka/strings.xml
es/values-km/strings.xml
es/values-lo/strings.xml
es/values-mn/strings.xml
es/values-ms/strings.xml
39ce9a51c21f28473556a25752025da2118875d3 05-Nov-2013 Baligh Uddin <baligh@google.com> am 05f3aaf8: (-s ours) am 9e8af13d: (-s ours) am 88064ddf: (-s ours) Import translations. DO NOT MERGE

* commit '05f3aaf8668858d24ce90bd595af09019dc9dc01':
Import translations. DO NOT MERGE
05f3aaf8668858d24ce90bd595af09019dc9dc01 05-Nov-2013 Baligh Uddin <baligh@google.com> am 9e8af13d: (-s ours) am 88064ddf: (-s ours) Import translations. DO NOT MERGE

* commit '9e8af13dc0c173364ac89696189b582d8e7de54c':
Import translations. DO NOT MERGE
9e8af13dc0c173364ac89696189b582d8e7de54c 05-Nov-2013 Baligh Uddin <baligh@google.com> am 88064ddf: (-s ours) Import translations. DO NOT MERGE

* commit '88064ddf52b7137e47176906f30a508d72fd3491':
Import translations. DO NOT MERGE
88064ddf52b7137e47176906f30a508d72fd3491 04-Nov-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ife9390482e6ead6f379e45fafc732e49234d7277
Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-fa/strings.xml
es/values-hi/strings.xml
es/values-iw/strings.xml
d558c880e4cd65dcd711a08ecc73bb49bb0bd530 30-Oct-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I5455d73b06239a5f43c1112f7c1796869f5400a8
Auto-generated-cl: translation import
es/values-ar/strings.xml
es/values-fa/strings.xml
es/values-hi/strings.xml
es/values-iw/strings.xml
0e1d3da3e6f4e072fdbfe720f096017a9963248b 28-Oct-2013 Jeff Sharkey <jsharkey@android.com> am 650e6f75: am 88ded90b: Pick certificates using OPEN_DOC intent.

* commit '650e6f75ebcf38c416fbf1586685b64f1ea6c7d8':
Pick certificates using OPEN_DOC intent.
650e6f75ebcf38c416fbf1586685b64f1ea6c7d8 28-Oct-2013 Jeff Sharkey <jsharkey@android.com> am 88ded90b: Pick certificates using OPEN_DOC intent.

* commit '88ded90b784beb372c49b1187ee69bdd4595cd10':
Pick certificates using OPEN_DOC intent.
88ded90b784beb372c49b1187ee69bdd4595cd10 25-Oct-2013 Jeff Sharkey <jsharkey@android.com> Pick certificates using OPEN_DOC intent.

Instead of blindly scanning just primary internal storage, use the
new DocumentsUI intents to let the user select certificates from
any storage backend. This includes both primary and secondary
external storage devices.

Bug: 11354402
Change-Id: Ia0b4bf1b30c83eb1a64b070cd2f99ad5e6498786
ndroidManifest.xml
rc/com/android/certinstaller/CertFile.java
rc/com/android/certinstaller/CertFileList.java
rc/com/android/certinstaller/CertInstallerMain.java
1163245d0a64c9490105706019c93ca4e2181449 25-Sep-2013 Baligh Uddin <baligh@google.com> am 475c2106: (-s ours) am ac414ef8: (-s ours) Import translations. DO NOT MERGE

* commit '475c210649506fa680f7a674468ba7a0fbeb5707':
Import translations. DO NOT MERGE
475c210649506fa680f7a674468ba7a0fbeb5707 25-Sep-2013 Baligh Uddin <baligh@google.com> am ac414ef8: (-s ours) Import translations. DO NOT MERGE

* commit 'ac414ef8e1f2654529b228e9b48ab19478b1f4a8':
Import translations. DO NOT MERGE
ac414ef8e1f2654529b228e9b48ab19478b1f4a8 25-Sep-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ie7eb81367672af757b52893a8258aea004b26249
Auto-generated-cl: translation import
es/values-iw/strings.xml
58a3330aa88b3b809a9d2ffa304fb093de523fe3 19-Sep-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I94a111819fe5279de897295956a47c74faeaca46
Auto-generated-cl: translation import
es/values-iw/strings.xml
89c239ba3c570fe92f7123fea72a9ccf6927428f 15-Sep-2013 Baligh Uddin <baligh@google.com> am f8651c9c: (-s ours) am 31e8375c: (-s ours) Import translations. DO NOT MERGE

* commit 'f8651c9c41b2fffbdb8bc3303916b7fc0fc5c642':
Import translations. DO NOT MERGE
f8651c9c41b2fffbdb8bc3303916b7fc0fc5c642 15-Sep-2013 Baligh Uddin <baligh@google.com> am 31e8375c: (-s ours) Import translations. DO NOT MERGE

* commit '31e8375c27f8e63e262276e216deecb99df1f7ab':
Import translations. DO NOT MERGE
31e8375c27f8e63e262276e216deecb99df1f7ab 15-Sep-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I3ad037b03518ee5ae9dc1969f79c3353aaacc1fe
Auto-generated-cl: translation import
es/values-en-rIN/strings.xml
es/values-et-rEE/strings.xml
es/values-fr-rCA/strings.xml
es/values-hi/strings.xml
es/values-hy-rAM/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-lo-rLA/strings.xml
es/values-mn-rMN/strings.xml
es/values-ms-rMY/strings.xml
es/values-zh-rHK/strings.xml
2573b2dc8c9c049d6809d9525a03671227a0c64c 11-Sep-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I68cfeb214a1f839e2d17d305ca58b84657d92de2
Auto-generated-cl: translation import
es/values-hi/strings.xml
f0824b00fba110d58d202bda048933f16aa53811 29-Aug-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I037691bcf1f7243631a6ead92f50f8bc06e0260c
Auto-generated-cl: translation import
es/values-az-rAZ/strings.xml
es/values-mn-rMN/strings.xml
fdd749ae1dbee2c8ce3516f0c6cff2496984588d 26-Aug-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I9e7f1a4facbc7d954c3c8381dd573d1b327c38f4
Auto-generated-cl: translation import
es/values-et-rEE/strings.xml
es/values-hy-rAM/strings.xml
es/values-ka-rGE/strings.xml
es/values-km-rKH/strings.xml
es/values-lo-rLA/strings.xml
es/values-ms-rMY/strings.xml
es/values-ne-rNP/strings.xml
es/values-si-rLK/strings.xml
f88a0879d0c32f05c75d8f4c7437f33970d9d63f 19-Aug-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ib443a5db63add77a4399cd6539cb19a546ce23af
Auto-generated-cl: translation import
es/values-az/strings.xml
es/values-en-rIN/strings.xml
es/values-fr-rCA/strings.xml
es/values-hy/strings.xml
es/values-ka/strings.xml
es/values-km/strings.xml
es/values-lo/strings.xml
es/values-mn/strings.xml
es/values-ne/strings.xml
es/values-si/strings.xml
es/values-zh-rHK/strings.xml
ed8faea378f949148993092b785c6438418c14b4 03-Jun-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ia8993ff516fcd3e102128ee6d3025576388bc691
Auto-generated-cl: translation import
es/values-zh-rCN/strings.xml
5801c37729efef44eb28cfe3036f4ed7c6f893a5 17-May-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I2cceffe87164f79feb299c60ea78643965b746d7
Auto-generated-cl: translation import
es/values-ar/strings.xml
155d3adb89e1bf28b0c414c0aa61d6d895f38fb2 09-May-2013 Baligh Uddin <baligh@google.com> am 69f0e1b2: (-s ours) am b256d693: Import translations. DO NOT MERGE

* commit '69f0e1b2636a7118dc5bbb8e98393d9c91c85df0':
Import translations. DO NOT MERGE
69f0e1b2636a7118dc5bbb8e98393d9c91c85df0 08-May-2013 Baligh Uddin <baligh@google.com> am b256d693: Import translations. DO NOT MERGE

* commit 'b256d69334d9141aefb3473d0839c31c9f396741':
Import translations. DO NOT MERGE
f456d3eb39077d54e15452c4a12f6ebe59583791 08-May-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Iad328a4792e01801e478f0014218a4c91c51747e
Auto-generated-cl: translation import
es/values-bg/strings.xml
es/values-lv/strings.xml
b256d69334d9141aefb3473d0839c31c9f396741 08-May-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I17eba3b67c379eaa0631c87b9255567609e6c911
Auto-generated-cl: translation import
es/values-bg/strings.xml
es/values-lv/strings.xml
6417766de03f2092a2de8ff06a070279e6645be8 06-May-2013 Baligh Uddin <baligh@google.com> am fed7ca4a: (-s ours) am d933ae29: Import translations. DO NOT MERGE

* commit 'fed7ca4a4195f77514a10950ef56e35c1e6c4fd4':
Import translations. DO NOT MERGE
fed7ca4a4195f77514a10950ef56e35c1e6c4fd4 06-May-2013 Baligh Uddin <baligh@google.com> am d933ae29: Import translations. DO NOT MERGE

* commit 'd933ae29003ab80e0a162daa2cd1f01d4d392c9f':
Import translations. DO NOT MERGE
84c4ecf844a4ceb498a7ff70bfcb9f8cf0afd42d 03-May-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I2f13b2153df780d94482a9b12eeecfd2a9e04f29
Auto-generated-cl: translation import
es/values-sl/strings.xml
es/values-vi/strings.xml
d933ae29003ab80e0a162daa2cd1f01d4d392c9f 03-May-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I4432d066e3bb6c9bad80144de526424d75b59295
Auto-generated-cl: translation import
es/values-sl/strings.xml
es/values-vi/strings.xml
bb0202ec654eec1aa6459ad7f3c152bf05476636 01-May-2013 Baligh Uddin <baligh@google.com> am 97e65d3e: (-s ours) am 2564e3a4: Import translations. DO NOT MERGE

* commit '97e65d3e39543a30f3bcf9d888c9010e21fd29b6':
Import translations. DO NOT MERGE
97e65d3e39543a30f3bcf9d888c9010e21fd29b6 01-May-2013 Baligh Uddin <baligh@google.com> am 2564e3a4: Import translations. DO NOT MERGE

* commit '2564e3a4e96fe567299ca47c9f7e288e3f28df0b':
Import translations. DO NOT MERGE
6c763987d9d639c49866a8bb8806c7ffd0c62eea 01-May-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ib66ba18bc2e27c983c2ec23f019d038bc4edf493
Auto-generated-cl: translation import
es/values-ca/strings.xml
2564e3a4e96fe567299ca47c9f7e288e3f28df0b 01-May-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ide77789f28653293b5c70cfe3b8c22b02bce852c
Auto-generated-cl: translation import
es/values-ca/strings.xml
337810ca29360662892ec928dbc0ebd3ebef4de0 24-Apr-2013 Baligh Uddin <baligh@google.com> am 0e0af3c9: am 5bed3637: Import translations. DO NOT MERGE

* commit '0e0af3c9f28a73a4499102ad7e11294cd81f307e':
Import translations. DO NOT MERGE
0e0af3c9f28a73a4499102ad7e11294cd81f307e 24-Apr-2013 Baligh Uddin <baligh@google.com> am 5bed3637: Import translations. DO NOT MERGE

* commit '5bed3637b0cc6002baf240d78741a634c0b0b66e':
Import translations. DO NOT MERGE
417f4af8fe8f2717f7834a89db30e8c6cf729705 24-Apr-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I087f02a3e788911cae44c41996637bc107677d95
Auto-generated-cl: translation import
es/values-hi/strings.xml
es/values-ko/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-zh-rCN/strings.xml
5bed3637b0cc6002baf240d78741a634c0b0b66e 24-Apr-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ida8a71e481d3c05539b81866248bfc5e6a3d8206
Auto-generated-cl: translation import
es/values-hi/strings.xml
es/values-ko/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-zh-rCN/strings.xml
8c4055d9a96c218503d3b38b61cdb365ce7fa159 23-Apr-2013 Baligh Uddin <baligh@google.com> am 80feba62: am d2439b3f: Import translations. DO NOT MERGE

* commit '80feba6272b753a8938effb427bd5ac392299f21':
Import translations. DO NOT MERGE
80feba6272b753a8938effb427bd5ac392299f21 23-Apr-2013 Baligh Uddin <baligh@google.com> am d2439b3f: Import translations. DO NOT MERGE

* commit 'd2439b3f2f105e4800ff3c257b43498ba849f4c4':
Import translations. DO NOT MERGE
ecf7a5d84de30f25f98eef2455d38cb632d4a665 22-Apr-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ia45924c46b7a7fd33ee287b69e7e074b140ba466
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
d2439b3f2f105e4800ff3c257b43498ba849f4c4 22-Apr-2013 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I58abd73a1d50628ccd8d91390ad831ebda3d78ae
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
50fa2bd686d28e01d0516894c7a122ea24808c89 17-Apr-2013 Kenny Root <kroot@google.com> am 7de56669: Add spinner to select Wi-Fi

* commit '7de56669876ed330f0ab4e603619273de1f51048':
Add spinner to select Wi-Fi
7de56669876ed330f0ab4e603619273de1f51048 17-Apr-2013 Kenny Root <kroot@google.com> Add spinner to select Wi-Fi

For the regular installation path, we now need to show a spinner so we
don't regress from previous behavior where we can install certs for wifi
from the main installation screen.

You can also get to this from the Wi-Fi AP list, so only show it when
the intended use is ambiguous.

Bug: 8600545
Change-Id: I8e9c905ff84142ed7c1f50bf77eb3fb5574f8df1
es/layout/name_credential_dialog.xml
es/values/strings.xml
rc/com/android/certinstaller/CertInstaller.java
rc/com/android/certinstaller/CredentialHelper.java
f2f62074691f58f2caff727a90d5b54aa5e199c5 15-Apr-2013 Kenny Root <kroot@google.com> am c3d5df93: keystore: remove old APIs

* commit 'c3d5df9307977f27ca4048055f003282a7095ee8':
keystore: remove old APIs
c3d5df9307977f27ca4048055f003282a7095ee8 13-Apr-2013 Kenny Root <kroot@google.com> keystore: remove old APIs

Remove the call sites that don't have the flags specified. This is to
ensure that callers know what flags they're setting.

Bug: 8122243
Change-Id: I4b7a8b9327cde5cbfe30c28870f8c31376a5b690
rc/com/android/certinstaller/CertInstaller.java
fe0d9fe18db2cfa591db804a6b98c73b8247c986 08-Apr-2013 Kenny Root <kroot@google.com> am 048bb6c3: Merge "Allow multiuser use of keystore"

* commit '048bb6c386ff614e9ad1294dc8e135b9f5922227':
Allow multiuser use of keystore
8823287fa10d30e3ebacf4a60befbef2a8cdef31 08-Apr-2013 Kenny Root <kroot@google.com> Allow multiuser use of keystore

Since keystore has been refactored to let muliple users use it
simultaneously, we can remove all the restrictions put into place to
prevent it.

(cherry picked from commit 89f8f9ab58947ba67f95c5784dc4288bf78a2fdf)

Bug: 7249554
Change-Id: I05e8804e35d762ad473d1649fdba34e4182a2c68
rc/com/android/certinstaller/CertInstaller.java
048bb6c386ff614e9ad1294dc8e135b9f5922227 08-Apr-2013 Kenny Root <kroot@google.com> Merge "Allow multiuser use of keystore"
89f8f9ab58947ba67f95c5784dc4288bf78a2fdf 08-Apr-2013 Kenny Root <kroot@google.com> Allow multiuser use of keystore

Since keystore has been refactored to let muliple users use it
simultaneously, we can remove all the restrictions put into place to
prevent it.

Bug: 7249554
Change-Id: Ia4a9f8cdd2f86b458805505e01ba9767330287d8
rc/com/android/certinstaller/CertInstaller.java
f1b6d8132706c1bef8fd5e238df6ff92fa8b2ff9 28-Mar-2013 Kenny Root <kroot@google.com> am a1008d4b: Merge "Add ability to install credentials as other UID"

* commit 'a1008d4bfa1c934419013da0d2186f0fe6ce9327':
Add ability to install credentials as other UID
a1008d4bfa1c934419013da0d2186f0fe6ce9327 28-Mar-2013 Kenny Root <kroot@google.com> Merge "Add ability to install credentials as other UID"
53622fc40b88047a1bc1f2dd6c97a5ad8e8c8f66 28-Mar-2013 Kenny Root <kroot@google.com> Add ability to install credentials as other UID

We need the ability to install from the system UID to wifi UID
to explicitly bind WiFi credentials to the WiFi profile. This adds the
ability for Wifi Settings to invoke installation of a PKCS12 file for
the wifi UID.

Bug: 8183258
Change-Id: I26970e563d68311b60dcdc78cd529322c5807368
ndroidManifest.xml
rc/com/android/certinstaller/CertFile.java
rc/com/android/certinstaller/CertFileList.java
rc/com/android/certinstaller/CertInstallerMain.java
rc/com/android/certinstaller/CredentialHelper.java
a68a3b053c849d405fcf62928605970ca6d71f13 25-Mar-2013 Kenny Root <kroot@google.com> am efe0f3ec: Merge "Remove useless intent filters"

* commit 'efe0f3ecda4aab3d3d95ce177b6dfd6f6aa26165':
Remove useless intent filters
efe0f3ecda4aab3d3d95ce177b6dfd6f6aa26165 25-Mar-2013 Kenny Root <kroot@google.com> Merge "Remove useless intent filters"
5163f464bcf58d8dc05c26aa5e1279a6da1b1ae3 22-Mar-2013 Kenny Root <kroot@google.com> Remove useless intent filters

It appears as though these activities had useless intent filters that
were not meant to be called from outside the package. They should only
be called from CertInstallerMain.

Change-Id: Ia111d9da9e6566f2176261c91043db8726fc6420
ndroidManifest.xml
d6f82551959365d648feb51d090b37c29a5ca6a8 14-Feb-2013 Kenny Root <kroot@google.com> am 3bad7fe9: Merge "KeyStore: stop using state()"

# Via Gerrit Code Review (1) and Kenny Root (1)
* commit '3bad7fe9d311844dd6533c73630d6cb7e4da785a':
KeyStore: stop using state()
3bad7fe9d311844dd6533c73630d6cb7e4da785a 14-Feb-2013 Kenny Root <kroot@google.com> Merge "KeyStore: stop using state()"
5d45af7ce08042bae0ff7523fe894eac1c0ebc52 14-Feb-2013 Kenny Root <kroot@google.com> KeyStore: stop using state()

Change-Id: I22daeb0f9873854af789a74ac3c7da2a32e34475
rc/com/android/certinstaller/CertInstaller.java
d1e308cf87d6ea9e428c58fa3644083f7835636a 21-Nov-2012 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I50d4b9f1f1bba36493e1896cf8e483c12a41535c
Auto-generated-cl: translation import
es/values-de/strings.xml
21fd5704a42bfc200dcc1abe1efc7aadd31b85d7 02-Oct-2012 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE"
3f360e11fe6fe67190e11a5916bbbb302a3e65f1 02-Oct-2012 Baligh Uddin <baligh@google.com> am c23edbe6: (-s ours) am 766ecd93: am e46af364: Import translations. DO NOT MERGE

* commit 'c23edbe6d997522e8c25ba7f52da500f8decd396':
Import translations. DO NOT MERGE
c23edbe6d997522e8c25ba7f52da500f8decd396 02-Oct-2012 Baligh Uddin <baligh@google.com> am 766ecd93: am e46af364: Import translations. DO NOT MERGE

* commit '766ecd93858756dab1d426d685bad78923729431':
Import translations. DO NOT MERGE
766ecd93858756dab1d426d685bad78923729431 02-Oct-2012 Baligh Uddin <baligh@google.com> am e46af364: Import translations. DO NOT MERGE

* commit 'e46af364c64b173ee83eac7b80c598a1583cb723':
Import translations. DO NOT MERGE
ee7376c557542596cbc5a74f1d13c623cef968a5 02-Oct-2012 Baligh Uddin <baligh@google.com> am 1013b8d2: (-s ours) am cb168840: Import translations. DO NOT MERGE

* commit '1013b8d2e2d8ec5a0e4d6a364570919123cd71f6':
Import translations. DO NOT MERGE
1013b8d2e2d8ec5a0e4d6a364570919123cd71f6 02-Oct-2012 Baligh Uddin <baligh@google.com> am cb168840: Import translations. DO NOT MERGE

* commit 'cb168840f9e764e688d7eb40ccdf6a498ad4269b':
Import translations. DO NOT MERGE
ad78a585200b0dfcdfb8bc450f3f01ce05686338 01-Oct-2012 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I2f2a6a305af8e973a9029d0cde3a0feaf74fb4df
Auto-generated-cl: translation import
es/values-ms/strings.xml
e46af364c64b173ee83eac7b80c598a1583cb723 01-Oct-2012 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ife8f2fe8647ac0b25b1c5a9aceea104d4a56f354
Auto-generated-cl: translation import
es/values-ms/strings.xml
cb168840f9e764e688d7eb40ccdf6a498ad4269b 01-Oct-2012 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: If2ff77dc0f70e2898168969760d0ae609b977ffa
Auto-generated-cl: translation import
es/values-ms/strings.xml
f73c03cc0fc9a800283af6958907cb4869b80297 28-Sep-2012 Jean-Baptiste Queru <jbq@google.com> am c2a3da3e: Merge from jb-mr1-aah-dev

* commit 'c2a3da3e111108e5af1511e9ee586cf7559e41fe':
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
c2a3da3e111108e5af1511e9ee586cf7559e41fe 28-Sep-2012 Jean-Baptiste Queru <jbq@google.com> Merge from jb-mr1-aah-dev

Change-Id: I2980277ad6342efb6f9f7ad1b13acc8a664c08e5
53cfbacac113746e53158f65d9023c1f62e10b40 26-Sep-2012 Baligh Uddin <baligh@google.com> am ad2febc0: (-s ours) Import translations. DO NOT MERGE

* commit 'ad2febc034ed809b6de7cfe787b44d64203e8ca9':
Import translations. DO NOT MERGE
37872e8e8d04fb42606c149aad09e7433a012454 26-Sep-2012 Baligh Uddin <baligh@google.com> am ad2febc0: (-s ours) Import translations. DO NOT MERGE

* commit 'ad2febc034ed809b6de7cfe787b44d64203e8ca9':
Import translations. DO NOT MERGE
6709169eadad1e6a4f7e9c4a66efc1e7eed4c86e 25-Sep-2012 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I6617153eaa55e45d02326cf5862ee1c4e245b4f5
Auto-generated-cl: translation import
es/values-ms/strings.xml
es/values-zu/strings.xml
ad2febc034ed809b6de7cfe787b44d64203e8ca9 25-Sep-2012 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ia21677faec4c93bf5ac4befed6be7e1a21ce0d62
Auto-generated-cl: translation import
es/values-ms/strings.xml
es/values-zu/strings.xml
2d41e5b8f45aaa55717a63ed4bf13202254f354d 25-Sep-2012 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ic5ae1b68c8b04ce4ae84b2f8c097c6c2cf037583
Auto-generated-cl: translation import
es/values-ms/strings.xml
es/values-zu/strings.xml
1ac20b5a0d34edc0b7f9396299e7399b31a9a07c 24-Sep-2012 Baligh Uddin <baligh@google.com> am bd212f8a: (-s ours) Import translations. DO NOT MERGE

* commit 'bd212f8aaf99f242b8f13901a9a1ee5f4db6fa89':
Import translations. DO NOT MERGE
e22349a704220a8d0d54bf937e1de19a027e1ce6 22-Sep-2012 Baligh Uddin <baligh@google.com> am bd212f8a: (-s ours) Import translations. DO NOT MERGE

* commit 'bd212f8aaf99f242b8f13901a9a1ee5f4db6fa89':
Import translations. DO NOT MERGE
9204d4a89e9f3bda265b0aad002a5dcce63665a2 22-Sep-2012 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
94f8c071fafbedc127dbc9bc9c82261c65f27364 21-Sep-2012 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ie007b9bc12dc62470bb9914e967da3783dfec899
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-es-rUS/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lv/strings.xml
es/values-nb/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-sk/strings.xml
es/values-tr/strings.xml
bd212f8aaf99f242b8f13901a9a1ee5f4db6fa89 21-Sep-2012 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I54fe65944d0d436734d501b672eee94620870aed
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-es-rUS/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lv/strings.xml
es/values-nb/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-sk/strings.xml
es/values-tr/strings.xml
97195fd5a267386c3629119d522bd6f8fdcb5457 21-Sep-2012 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ie66e6d20dc19d8ac13435920e3926ea001f23b53
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-es-rUS/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lv/strings.xml
es/values-nb/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-sk/strings.xml
es/values-tr/strings.xml
d4b93a8c280acfad63ae02710938bde1e8fef9b1 21-Sep-2012 Baligh Uddin <baligh@google.com> am aa06c792: (-s ours) Import translations. DO NOT MERGE

* commit 'aa06c792d6d4c44a4ffe266a0d2cbe3cf97723b3':
Import translations. DO NOT MERGE
4b0c517014599d88ef6cb3aa43f7e981437809ee 21-Sep-2012 Baligh Uddin <baligh@google.com> Merge "Import translations. DO NOT MERGE"
ff812816a17ec4cf71097f01ea338d401f6ce65a 21-Sep-2012 Baligh Uddin <baligh@google.com> am aa06c792: (-s ours) Import translations. DO NOT MERGE

* commit 'aa06c792d6d4c44a4ffe266a0d2cbe3cf97723b3':
Import translations. DO NOT MERGE
2c649262356f4357a134bacbb579e6a2c6e464f5 21-Sep-2012 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: If907d634e7a78b60ebdf0dba16b1f4d2b13ee23e
Auto-generated-cl: translation import
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-es/strings.xml
es/values-fi/strings.xml
es/values-hr/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-lt/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-ru/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
aa06c792d6d4c44a4ffe266a0d2cbe3cf97723b3 21-Sep-2012 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ibd5b43953b7c16538cb0b437524d81d8246cbcc7
Auto-generated-cl: translation import
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-es/strings.xml
es/values-fi/strings.xml
es/values-hr/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-lt/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-ru/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
94a75c4cd62ad60409a0e9bad9bba9cf36a0ddcc 21-Sep-2012 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I86ef69920a7c1cfe7508a77aa22f87491bc2ee88
Auto-generated-cl: translation import
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-es/strings.xml
es/values-fi/strings.xml
es/values-hr/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-lt/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-ru/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
6dd718017836b3931e2295be45510cad541bb376 20-Sep-2012 Baligh Uddin <baligh@google.com> am 23f86974: (-s ours) Import translations. DO NOT MERGE

* commit '23f869745ced4628260221db2f18b02cd1dda6a5':
Import translations. DO NOT MERGE
aaf9ca534e32708ddf801f09f7af9a981ee0c943 20-Sep-2012 Baligh Uddin <baligh@google.com> am 23f86974: (-s ours) Import translations. DO NOT MERGE

* commit '23f869745ced4628260221db2f18b02cd1dda6a5':
Import translations. DO NOT MERGE
590503a5d29fad68d632f3564777ad1930fefc83 20-Sep-2012 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I19dbe403845cb0432a265222e960e3cafba29add
Auto-generated-cl: translation import
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-nl/strings.xml
es/values-sv/strings.xml
es/values-uk/strings.xml
es/values-zu/strings.xml
23f869745ced4628260221db2f18b02cd1dda6a5 20-Sep-2012 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Icf344fea0af7442faf80bfac3aea7b86c06ed20d
Auto-generated-cl: translation import
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-nl/strings.xml
es/values-sv/strings.xml
es/values-uk/strings.xml
es/values-zu/strings.xml
a52e6e8477edcb569da5c6288656a8d7ba635fd0 20-Sep-2012 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I2e32f7356506af3e0495c92f999ddb9c01eb099e
Auto-generated-cl: translation import
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-nl/strings.xml
es/values-sv/strings.xml
es/values-uk/strings.xml
es/values-zu/strings.xml
45181f31a781952b791316246bdf2be3d25bcbd8 18-Sep-2012 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I632952dfefca68ae629f2d28170afa6e02914af1
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
bf6f0c88e6ab20ec9c97dfd3cd46c9ceb726938a 18-Sep-2012 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I649cf708c26632fe60e5fdd54a5defbd92a182a1
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
220f01ef20f24838cbda5ba4f546e78d97cf01d4 17-Sep-2012 Baligh Uddin <baligh@google.com> am 1116baa5: (-s ours) Import translations. DO NOT MERGE

* commit '1116baa54bd069521592d0fa755d4cfd428517c6':
Import translations. DO NOT MERGE
20d694456de0c0d4eb714854b0dad3d87d543056 17-Sep-2012 Kenny Root <kroot@google.com> am fba4bf92: Do not allow non-primary user to install certs

* commit 'fba4bf924c4655024d6175523f3112fc09e7affc':
Do not allow non-primary user to install certs
fae57c66821d0fec40a02882ddf8b85eb1b479b2 17-Sep-2012 Baligh Uddin <baligh@google.com> am 1116baa5: (-s ours) Import translations. DO NOT MERGE

* commit '1116baa54bd069521592d0fa755d4cfd428517c6':
Import translations. DO NOT MERGE
1116baa54bd069521592d0fa755d4cfd428517c6 17-Sep-2012 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: Ia5f44282173b0ddeab902cb95fcf16e192109c07
Auto-generated-cl: translation import
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-be/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-et/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
fba4bf924c4655024d6175523f3112fc09e7affc 16-Sep-2012 Kenny Root <kroot@google.com> Do not allow non-primary user to install certs

Change-Id: If0896215a4fe1fc0d982a74bd6fee8551e4671fd
es/values/strings.xml
rc/com/android/certinstaller/CertInstaller.java
04bc8510f111f61254958adcfaae8000557043cf 13-Sep-2012 Baligh Uddin <baligh@google.com> Import translations. DO NOT MERGE

Change-Id: I4eed49bdfed9e97d7944490a5a16ec729fd8cfd9
Auto-generated-cl: translation import
es/values-zh-rTW/strings.xml
99b10f59dd827314bd7fc124d6d0a84c56351ce2 05-Sep-2012 Brian Carlstrom <bdc@google.com> Tracking upgrade to bouncycastle 1.47

Change-Id: Ic6744ae517ab1d3b49de45edd05979dd164bfade
rc/com/android/certinstaller/CredentialHelper.java
abe912627477bb62656708b8fb4d071be59e1239 16-Jul-2012 Ying Wang <wangying@google.com> Import translations. DO NOT MERGE

Change-Id: I95b1814f5c02241b6a527cc2162be4f9d69ab9e3
Auto-generated-cl: translation import
es/values-fa/strings.xml
f013d1f2a04e69d1695d1a3bd4ea3e114fb20d50 13-Jul-2012 Ying Wang <wangying@google.com> Import translations. DO NOT MERGE

Change-Id: Ife2d738b9905b982fbc6b8242a29612886ef06cb
Auto-generated-cl: translation import
es/values-fa/strings.xml
75082da1ee2173e8d3311acfab261df5941cbe37 12-Jul-2012 Ying Wang <wangying@google.com> Import translations. DO NOT MERGE

Change-Id: I7b1b65e78617a5631c35f6166e193d2dbf9ba80d
Auto-generated-cl: translation import
es/values-fa/strings.xml
2b6c22258513935c5b713e269804efffd12591f6 18-Jun-2012 Ying Wang <wangying@google.com> Import translations. DO NOT MERGE

Change-Id: I7c0903f9dcb872d5db38287875394f1540473661
es/values-tr/strings.xml
5023e26c758c8a972c64d8808150c74588b87d20 25-May-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: If72a89d5cb7ae3ed416d56a5f6d036f4086d771e
es/values-es/strings.xml
es/values-zh-rCN/strings.xml
83df03c8f5d61d37e2fda501c67937f970b7af0c 16-Apr-2012 Brian Carlstrom <bdc@google.com> Allow empty passwords when installing from a PKCS#12 file

Bug: http://code.google.com/p/android/issues/detail?id=28189
Change-Id: I6ce96eba0e7e583e49a17179d3f3c66df5f13a29
rc/com/android/certinstaller/CertInstaller.java
7cadd03679b93cc0f87a9cf8f421f99984cbb182 13-Apr-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: I119a8393d292a065f723cbadcc57d45be7b97d29
es/values-in/strings.xml
99b5b7d1249b4fadc196d9a32c38d345517fb4b2 03-Apr-2012 Mike Lockwood <lockwood@google.com> Merge remote-tracking branch 'goog/ics-aah'
f4616bf8c0b3bff8863d627c3c003fa9234cb225 31-Mar-2012 Brian Carlstrom <bdc@google.com> Broader support for KeyChain.EXTRA_NAME

Previously EXTRA_NAME only supplied the default name when used with
KeyChain.EXTRA_CERTIFICATE. It now also provides the default name with
KeyChain.EXTRA_PKCS12, overriding the value found within the PKCS#12
file. In addition, will be used as the default alias name when
credentials are installed from external storage as opposed to via
an extra.

Bug: 6129421
Change-Id: I63c06a866fc62bfa56636011b766d3dcae7764bd
rc/com/android/certinstaller/CertFile.java
rc/com/android/certinstaller/CertInstallerMain.java
rc/com/android/certinstaller/CredentialHelper.java
7d99ba835013491e9d3d540a937e5e0a742b1ab4 08-Mar-2012 Kenny Root <kroot@google.com> Convert to new KeyStore format

The keystore no longer stores private keys in the clear, so it shouldn't
have its private key material in PEM. It will just be an opaque handle
for a private key.

Change-Id: I939169338d0f7dc39743c9904166454f2cad49cc
rc/com/android/certinstaller/CredentialHelper.java
684eef930695db885dae407e86b8e4c4babf8914 07-Mar-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: I828d313dcad89ad34f5c39cf258547b47a9e0937
es/values-in/strings.xml
9258f0709ea23afa0f2c66a5654c0464da7644d3 13-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 9d9df27c: am 4fad005f: am 5e794499: Merge "Remove PKCS12_PASSWORD_DIALOG and NAME_CREDENTIAL_DIALOG in order to correctly recreate it on onCreateDialog"

* commit '9d9df27c20ea169b4e90a17f1a1c1a244906c96b':
Remove PKCS12_PASSWORD_DIALOG and NAME_CREDENTIAL_DIALOG in order to correctly recreate it on onCreateDialog
9d9df27c20ea169b4e90a17f1a1c1a244906c96b 13-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 4fad005f: am 5e794499: Merge "Remove PKCS12_PASSWORD_DIALOG and NAME_CREDENTIAL_DIALOG in order to correctly recreate it on onCreateDialog"

* commit '4fad005fbc84825278d341ffb8a9a5c5c9f95a32':
Remove PKCS12_PASSWORD_DIALOG and NAME_CREDENTIAL_DIALOG in order to correctly recreate it on onCreateDialog
4fad005fbc84825278d341ffb8a9a5c5c9f95a32 13-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 5e794499: Merge "Remove PKCS12_PASSWORD_DIALOG and NAME_CREDENTIAL_DIALOG in order to correctly recreate it on onCreateDialog"

* commit '5e794499725296c2d436ccbe54e5517037938172':
Remove PKCS12_PASSWORD_DIALOG and NAME_CREDENTIAL_DIALOG in order to correctly recreate it on onCreateDialog
5e794499725296c2d436ccbe54e5517037938172 13-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Remove PKCS12_PASSWORD_DIALOG and NAME_CREDENTIAL_DIALOG in order to correctly recreate it on onCreateDialog"
c6ba3c6ef103c956f501c65754aad9345adc6dcf 10-Feb-2012 Eric Fischer <enf@google.com> am d9195b1a: (-s ours) am 8292ec01: (-s ours) Import translations. DO NOT MERGE

* commit 'd9195b1a522d14c130592cb770b8a4051db47229':
Import translations. DO NOT MERGE
d9195b1a522d14c130592cb770b8a4051db47229 10-Feb-2012 Eric Fischer <enf@google.com> am 8292ec01: (-s ours) Import translations. DO NOT MERGE

* commit '8292ec0171aa61d9372d8ea24d7d5c0e6bb915fa':
Import translations. DO NOT MERGE
1c36bf93ed952d377a4de0a76e6d4bcba6f3a585 10-Feb-2012 Eric Fischer <enf@google.com> am 8292ec01: Import translations. DO NOT MERGE

* commit '8292ec0171aa61d9372d8ea24d7d5c0e6bb915fa':
Import translations. DO NOT MERGE
8292ec0171aa61d9372d8ea24d7d5c0e6bb915fa 09-Feb-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: I3f9408037dd1ad87c8c326badd044f8412ee7c35
es/values-es-rUS/strings.xml
es/values-rm/strings.xml
885c0a68bb4a91d461914c43c2e42a565394aa59 03-Feb-2012 Shuhrat Dehkanov <uzbmaster@gmail.com> Remove PKCS12_PASSWORD_DIALOG and NAME_CREDENTIAL_DIALOG in order to correctly recreate it on onCreateDialog

If an empty password or name is supplied for certificate password or certificate name dialogs, respectively,
showDialog is called without removing them. As a result onCreateDialog is not called leaving the dialog without visible UI to the user.

Steps to reproduce:
1. Put password protected certificate to the SD card.
2. Navigate to Settings > Security and initiate certificate installation.
3. Provide an empty password and press OK.
3.1. Provide an empty name for NAME_CREDENTIAL_DIALOG related issue.

Change-Id: I83ffd680313eb9c69214113d3091a70910a80ae2
Signed-off-by: Shuhrat Dehkanov <uzbmaster@gmail.com>
rc/com/android/certinstaller/CertInstaller.java
rc/com/android/certinstaller/ViewHelper.java
0833d94f5e091acb4f92edeef05cc53bc29eda48 26-Jan-2012 Eric Fischer <enf@google.com> Import translations. DO NOT MERGE

Change-Id: I308c2b9bb5b199c558cdc8c93b972a3f320d22ff
es/values-be/strings.xml
es/values-et/strings.xml
es/values-rm/strings.xml
be91014ed30b831ed07ebd227f842e549e517a60 29-Dec-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: Ib86c34a82a0d665725933083cb3696adf5d4bd5b
es/values-sw/strings.xml
es/values-vi/strings.xml
es/values-zh-rTW/strings.xml
20bde4214b8183869c0065512301f7029cd8598a 22-Nov-2011 Eric Fischer <enf@google.com> am 72a70411: (-s ours) Import revised translations. DO NOT MERGE

* commit '72a7041136b14e4ee98d3e53837c7dff6d54402b':
Import revised translations. DO NOT MERGE
07c2b2c2e1a86e77a6a3867ff3c3da1caf508b07 22-Nov-2011 Eric Fischer <enf@google.com> am 72a70411: Import revised translations. DO NOT MERGE

* commit '72a7041136b14e4ee98d3e53837c7dff6d54402b':
Import revised translations. DO NOT MERGE
72a7041136b14e4ee98d3e53837c7dff6d54402b 21-Nov-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I834bc89a2b6669da2f91706c564b5ecf4b3d66e0
es/values-vi/strings.xml
c50c19bbbfa683738dc69b8850402660f68dfb3b 17-Nov-2011 Eric Fischer <enf@google.com> am a70922ff: (-s ours) Import revised translations. DO NOT MERGE

* commit 'a70922fff3821eb8de52e071105c02371c0cbd58':
Import revised translations. DO NOT MERGE
f081ad319cd05dd22b6e4de2a57ad5ad786e018a 16-Nov-2011 Eric Fischer <enf@google.com> am a70922ff: Import revised translations. DO NOT MERGE

* commit 'a70922fff3821eb8de52e071105c02371c0cbd58':
Import revised translations. DO NOT MERGE
a70922fff3821eb8de52e071105c02371c0cbd58 16-Nov-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I0a22bb72e18483dd1f27cd8c2b502168ae678058
es/values-iw/strings.xml
8108249511dea62efe9ab4fe5de18d34ea142f3a 11-Nov-2011 Eric Fischer <enf@google.com> Merge "Import revised translations."
2a41b4b79c11858a94596ceccd15831c2195ea65 10-Nov-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I3e3373a8ab47562aca8ec624181aaac1e3884d1f
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
778a2208d98249b8e1fce7579aefad42cf772a26 10-Nov-2011 Eric Fischer <enf@google.com> am 2546ac02: (-s ours) am 86b2f598: (-s ours) Import revised translations. DO NOT MERGE

* commit '2546ac02e62bb29c8a99529de605062bb1137114':
Import revised translations. DO NOT MERGE
732012d52cd4e4316332272b5a7746446f21bba3 10-Nov-2011 Eric Fischer <enf@google.com> am 2546ac02: am 86b2f598: (-s ours) Import revised translations. DO NOT MERGE

* commit '2546ac02e62bb29c8a99529de605062bb1137114':
Import revised translations. DO NOT MERGE
2546ac02e62bb29c8a99529de605062bb1137114 10-Nov-2011 Eric Fischer <enf@google.com> am 86b2f598: (-s ours) Import revised translations. DO NOT MERGE

* commit '86b2f598353c8f93512df3deeb07fd5f0ff1f558':
Import revised translations. DO NOT MERGE
86b2f598353c8f93512df3deeb07fd5f0ff1f558 09-Nov-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: Icabfe1bf8548b2c03b6c4244381f92c71dbe9193
es/values-iw/strings.xml
e22f8c93c8e82437e4bb89d424955004dfdd7267 02-Nov-2011 Claudia de Veaux <deveaux@google.com> String edits to use standard UI text terminology
and punctuation. For ex, We use contractions now
and don't say "please" anymore.
Bugs: 5165745, 5163232, 5162668, 5162667, 5162328

Change-Id: I10f6903d60cb3df736521c20d2bdd8bff400decf

Typo fixed after self-review.
es/values/strings.xml
6d1e19b1d99390e179168d7202f3c80b22ddff3b 02-Nov-2011 Eric Fischer <enf@google.com> Merge "Import revised translations."
5f124138e7152b337c63b6a6dc433feeb2421dc1 02-Nov-2011 Eric Fischer <enf@google.com> am 8d57f6e9: Import revised translations.

* commit '8d57f6e9b165b58e2347b616b05985b4a6717f77':
Import revised translations.
876dfd6d20040d33bf99ab9cacd89c7948e55772 02-Nov-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I3af847e83c9cc172190d2a3e3d5a93fc825a10cd
es/values-be/strings.xml
es/values-et/strings.xml
6804032c07702affe1cec6fb1162e43683109d4e 01-Nov-2011 Eric Fischer <enf@google.com> am 8d57f6e9: Import revised translations.

* commit '8d57f6e9b165b58e2347b616b05985b4a6717f77':
Import revised translations.
8d57f6e9b165b58e2347b616b05985b4a6717f77 01-Nov-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: Ie921e64107c39f019f0e2fc2a0296aa30ee6c45f
es/values-be/strings.xml
es/values-et/strings.xml
d237e2e1774692474f3c71d0a32566d8377f61f6 28-Oct-2011 Ed Heyl <ed@google.com> keep previous history after reset to mr1 plus aah changes (ics-aah-wip)
29dfba3162c1ac3203c1ab277fc4d4bd43165243 26-Oct-2011 Ed Heyl <ed@google.com> undo reset to ics-mr1 until we have a better method
d89e834be149521903b611a4c7839cf15328bade 26-Oct-2011 Ed Heyl <ed@google.com> reset to ics-mr1, but keep history
d0a76c156c678b107ad5bc97c548e68e46ae904c 26-Oct-2011 Eric Fischer <enf@google.com> am cb55e906: (-s ours) Import revised translations. DO NOT MERGE

* commit 'cb55e906fa97117dfcc4c7dd33ba78a2f9ab7932':
Import revised translations. DO NOT MERGE
cb55e906fa97117dfcc4c7dd33ba78a2f9ab7932 26-Oct-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I4635fb7b6c46345f12063a5914d3d6e55f1b4779
es/values-it/strings.xml
324124315338835ad94da2c6857fb896068cc554 25-Oct-2011 Eric Fischer <enf@google.com> am fe3f2097: Import revised translations.

* commit 'fe3f2097870c7c8e6ca525aca60688dc18702fe6':
Import revised translations.
fe3f2097870c7c8e6ca525aca60688dc18702fe6 25-Oct-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I96b2e4423a272cca565fd390a30001b3d7fe4b14
es/values-it/strings.xml
d6cddca3b969168a9e850c3a3d67a187e17c1fa8 22-Oct-2011 Eric Fischer <enf@google.com> am 38b668b4: (-s ours) am 2d389665: (-s ours) Import revised translations. DO NOT MERGE

* commit '38b668b44eaf0089f84f1ba8ca76f06ec919b45c':
Import revised translations. DO NOT MERGE
38b668b44eaf0089f84f1ba8ca76f06ec919b45c 22-Oct-2011 Eric Fischer <enf@google.com> am 2d389665: (-s ours) Import revised translations. DO NOT MERGE

* commit '2d389665f8258aaaf2369217971da0eda3656102':
Import revised translations. DO NOT MERGE
2d389665f8258aaaf2369217971da0eda3656102 21-Oct-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I4f1472cc0b550b9414ec0d22c8edfcc2949eb8ec
es/values-it/strings.xml
9c7ddd74edb60b1c3884de0cedb9e1077fd46e45 19-Oct-2011 Eric Fischer <enf@google.com> am 3c9afcbb: Merge "Import revised translations."

* commit '3c9afcbb90a73991ee493da9d364fa840640789c':
Import revised translations.
3c9afcbb90a73991ee493da9d364fa840640789c 19-Oct-2011 Eric Fischer <enf@google.com> Merge "Import revised translations."
e5b48b5b1e99afee317dba6aaec47da8bb4aaeba 19-Oct-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I642749bad3586c233553fcddc1d44a19bbb82254
es/values-hi/strings.xml
es/values-pl/strings.xml
8fbc7608dbfcad32429167a07ef6601e834ba257 18-Oct-2011 Eric Fischer <enf@google.com> am 8640562b: (-s ours) am 014fe2d5: (-s ours) Import revised translations. DO NOT MERGE

* commit '8640562b50fda6769b1255604b67b9aabec0bbef':
Import revised translations. DO NOT MERGE
8640562b50fda6769b1255604b67b9aabec0bbef 18-Oct-2011 Eric Fischer <enf@google.com> am 014fe2d5: (-s ours) Import revised translations. DO NOT MERGE

* commit '014fe2d51f93e03972157d572633546e5ea35a66':
Import revised translations. DO NOT MERGE
014fe2d51f93e03972157d572633546e5ea35a66 18-Oct-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I009fa0ab0e71e8f1f9cd88ec5314217e42f6f69f
es/values-hi/strings.xml
es/values-pl/strings.xml
a8017311e57c8cccc175185ac0db35f8029bc0c1 10-Oct-2011 Eric Fischer <enf@google.com> am 2b4e09fc: Import revised translations.

* commit '2b4e09fc8a98bee3036ccf0d10e325745cef8455':
Import revised translations.
2b4e09fc8a98bee3036ccf0d10e325745cef8455 08-Oct-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: Ic86f4997c5694b959d96d680a8293c3bbe0b580a
es/values-fa/strings.xml
83f33927ba018c5bf0834087554b730951181f12 01-Oct-2011 Eric Fischer <enf@google.com> am dc51b08b: Import revised translations.

* commit 'dc51b08b145b27ae4e362abd0f248b2e800b40f9':
Import revised translations.
dc51b08b145b27ae4e362abd0f248b2e800b40f9 01-Oct-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: Iea35bef3772d1677c157d720065286daa09916d7
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
27d0a8d4772134e5fc66990ae9f4c245bfe46efd 29-Sep-2011 Eric Fischer <enf@google.com> am 15451904: (-s ours) am bf7fadf9: (-s ours) Import revised translations. DO NOT MERGE.

* commit '15451904e910c41ad3894fe5b6e21a9b4b086b4a':
Import revised translations. DO NOT MERGE.
15451904e910c41ad3894fe5b6e21a9b4b086b4a 29-Sep-2011 Eric Fischer <enf@google.com> am bf7fadf9: (-s ours) Import revised translations. DO NOT MERGE.

* commit 'bf7fadf9ff043f89037978b9d3b22e6f011bc343':
Import revised translations. DO NOT MERGE.
bf7fadf9ff043f89037978b9d3b22e6f011bc343 29-Sep-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE.

Change-Id: Ia8cc2ed776a7d4957382c7d1ce328036f3fc93ad
es/values-am/strings.xml
es/values-lv/strings.xml
b629a2e1639479eb58804f4acdaa72ca93a30fa9 24-Sep-2011 Eric Fischer <enf@google.com> am f4297575: (-s ours) am 6cfb69a5: (-s ours) Import revised translations. DO NOT MERGE

* commit 'f4297575d63f726aeed29f3f220c46e54c785c49':
Import revised translations. DO NOT MERGE
f4297575d63f726aeed29f3f220c46e54c785c49 24-Sep-2011 Eric Fischer <enf@google.com> am 6cfb69a5: (-s ours) Import revised translations. DO NOT MERGE

* commit '6cfb69a543776918075d2571514ddb15876be6fa':
Import revised translations. DO NOT MERGE
6cfb69a543776918075d2571514ddb15876be6fa 24-Sep-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I7c4a698e6269baafc090ebb69003e17090875e56
es/values-fa/strings.xml
es/values-ja/strings.xml
es/values-sw/strings.xml
es/values-tr/strings.xml
947b282d6365ba5d17d13e39f6bf40887ee315c5 21-Sep-2011 Eric Fischer <enf@google.com> am b7bf7cde: (-s ours) am 3f529315: (-s ours) Import revised translations. DO NOT MERGE

* commit 'b7bf7cde438749a470d7ba164fe0585b0f3ecb06':
Import revised translations. DO NOT MERGE
b7bf7cde438749a470d7ba164fe0585b0f3ecb06 21-Sep-2011 Eric Fischer <enf@google.com> am 3f529315: (-s ours) Import revised translations. DO NOT MERGE

* commit '3f529315303337e570c66349134b59b29075865b':
Import revised translations. DO NOT MERGE
3f529315303337e570c66349134b59b29075865b 21-Sep-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I03d71dac626aef3700bb244b4d96e4141d914fad
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-iw/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
2b73a2596be69066e372ea299ea5ebbda8bbd49c 20-Sep-2011 Eric Fischer <enf@google.com> am f41cf0a2: Import revised translations.

* commit 'f41cf0a241788edd90c793b46415b2972e2ce592':
Import revised translations.
f41cf0a241788edd90c793b46415b2972e2ce592 20-Sep-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: Ic38bfa2be7db4695e07f17db6b133abf3023864a
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
33cbab668e5d9a645a3d7ceedc8b8634e08747a1 17-Sep-2011 Eric Fischer <enf@google.com> am 8c36b376: (-s ours) am 40320d2b: (-s ours) Import revised translations. DO NOT MERGE

* commit '8c36b376b838f36b36f0995bd3b6d73cae40af1b':
Import revised translations. DO NOT MERGE
8c36b376b838f36b36f0995bd3b6d73cae40af1b 17-Sep-2011 Eric Fischer <enf@google.com> am 40320d2b: (-s ours) Import revised translations. DO NOT MERGE

* commit '40320d2b278f433396e941dd4a6b098bab90f6e2':
Import revised translations. DO NOT MERGE
40320d2b278f433396e941dd4a6b098bab90f6e2 17-Sep-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I4c73dc9889974a607f4d64fce8133856bc9b7075
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-en-rGB/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-fr/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-it/strings.xml
es/values-iw/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ms/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-ru/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-sv/strings.xml
es/values-sw/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-tr/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values-zu/strings.xml
c256369ee7fe39051f35bc9b04dfad78f9644d80 13-Sep-2011 Ben Komalo <benkomalo@google.com> Make cert name selected by default.

This makes it easy to replace if it's a big giberrish string.

Bug: 5280250
Change-Id: Iaedee686a3c56133f4e417a40f9175a194181c6c
es/values/strings.xml
rc/com/android/certinstaller/CertInstaller.java
ddb88df9b6ec1bc68898e9db3dd1ea15eb3d7079 22-Aug-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: Ia81a4d33c0e3b98e88dbf4291d51ff37770f6381
es/values-iw/strings.xml
c1615f66f7dbe5a76aefca862d96e0b5a6e123ff 22-Jul-2011 Ben Komalo <benkomalo@google.com> Handle VIEW intents for cert installer

Bug: 4556536
Change-Id: I1d3b8e4b80415e2df9dfe334f0d9e195ab0e19ff
ndroidManifest.xml
rc/com/android/certinstaller/CertInstallerMain.java
8a306cbc86ff63074d0c53593f1eb89fb8478a05 09-Aug-2011 Eric Fischer <enf@google.com> Fix typo in German translation.

Change-Id: I874a27cf78777dfbf830028905e95fa14e421165
es/values-de/strings.xml
1fbcb97527d1e034d5410f3fd126ebee77fc3fee 06-Aug-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I1a3a98adaef477d4d1c59f95c5102758588180c9
es/values-de/strings.xml
02bc75ac514bf39be7915e9d76d863d3ba8ac8bf 04-Aug-2011 Brian Carlstrom <bdc@google.com> am b3fd57e6: am c6e6ab79: Merge "Update german translation. Fixed a typo."

* commit 'b3fd57e6bc499beb527b67527d51b40d5921d4c3':
Update german translation. Fixed a typo.
b3fd57e6bc499beb527b67527d51b40d5921d4c3 03-Aug-2011 Brian Carlstrom <bdc@google.com> am c6e6ab79: Merge "Update german translation. Fixed a typo."

* commit 'c6e6ab796968812d5791db0b86d04180609ca854':
Update german translation. Fixed a typo.
c6e6ab796968812d5791db0b86d04180609ca854 03-Aug-2011 Brian Carlstrom <bdc@google.com> Merge "Update german translation. Fixed a typo."
e38be3c8c922c8bce6b13e930cfca2c9e7efafac 29-Jul-2011 Christopher Tate <ctate@google.com> Merge "Ignore the cert installer for backup/restore purposes"
7978f8646c9cebcafba9546cd2c4b1a1dcb119a5 28-May-2011 Danez <code@tschinder.de> Update german translation. Fixed a typo.

Change-Id: I0ac9fe321bd78b11b460d03648f127adced42409
es/values-de/strings.xml
a686ed87f300df81f62ab11318573602192e6987 26-Jul-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I6753f375ab34ef1bfbe9ba5f0c5b5d633f737c71
es/values-zu/strings.xml
f6aa3146b6e757f19ab9e0ae2e83ff3ed5f4819e 23-Jul-2011 Christopher Tate <ctate@google.com> Ignore the cert installer for backup/restore purposes

Change-Id: Ic01c6e051eb57fcca2c2465b231b9a588951ec1e
ndroidManifest.xml
6952ee2bb146db2979aff3cfd6d18cbdebd8a7e9 22-Jul-2011 Brian Carlstrom <bdc@google.com> Rotation fixes for CertInstaller

When rotating, the dialog would be dismissed, which the handler took
as a user negative action and called toastErrorAndFinish. Fixed by
having click handlers on the buttons themselves.

Bug: 5051850
Change-Id: I5f1aeb6c918b2b7b6bebf096ee25ff8247b5877d
rc/com/android/certinstaller/CertInstaller.java
77e1f401b283429aab853c2324da574dc293ab42 22-Jul-2011 Brian Carlstrom <bdc@google.com> Restore installation of CAs from PKCS#12 files
Bug: 5037971

Change-Id: I35770bc5f536ee4ceb51c5fac655e7e5b9b8d89d
rc/com/android/certinstaller/CredentialHelper.java
a0bdabb40db36f2adf458c32055e5c7ee817105a 10-Jul-2011 Brian Carlstrom <bdc@google.com> Remove PKEY_MAP entry when empty

Change-Id: I7a532209d906f0e2194fccaf5eafd8602f3cb57a
rc/com/android/certinstaller/CertInstaller.java
a921a7f6b86e2564f70e841c0b10b368f6b8d495 07-Jul-2011 Brian Carlstrom <bdc@google.com> Canceling cert installation should not delete the file

Also fix to exit CertFileList when list becomes empty

Bug: 4600283
Change-Id: Ib0a27f8d2f9ee4be8da02625e9f919bcfa6e791b
rc/com/android/certinstaller/CertFile.java
rc/com/android/certinstaller/CertFileList.java
rc/com/android/certinstaller/CertInstaller.java
00736f76392c742e9c72c51f158ad7020f22524c 29-Jun-2011 Brian Carlstrom <bdc@google.com> Tracking move to KeyChain credential installation API

Bug: 3497064
Change-Id: I4d49354f4687f95d8239ea98d79bd61d06c4ce82
rc/com/android/certinstaller/CertFile.java
rc/com/android/certinstaller/CertFileList.java
rc/com/android/certinstaller/CertInstaller.java
rc/com/android/certinstaller/CredentialHelper.java
fcd5fb26acec88e98c3bedb41d4510888f7890cd 24-Jun-2011 Brian Carlstrom <bdc@google.com> Replace KeyChainActivity placeholder UI with more polished dialog (3 of 5)

frameworks/base

Extended KeyChain.chooserPrivateKeyAlias to allow caller to supply
preferred choice to be selected in chooser. This allows Email
settings to highlight the current choice when allowing user to
change settings.
keystore/java/android/security/KeyChain.java
api/current.txt

Implemented KeyChain functionality to pass host and port
information to KeyChainActivity for display.
keystore/java/android/security/KeyChain.java

KeyChain now sends a PendingIntent as part of the Intent it sends
to the KeyChainActivity which can be used to identify the caller
in reliable way.
keystore/java/android/security/KeyChain.java

Moved .pfx/.p12/.cer/.crt constants to Credentials for reuse.
Added Credentials.install variant with no value for use from KeyChainActivity
keystore/java/android/security/Credentials.java

packages/apps/CertInstaller
Source of extension constants now in Credentials
src/com/android/certinstaller/CertFile.java

packages/apps/Browser
Have browser supply host and port information to KeyChain.choosePrivateKeyAlias
Tracking KeyChain.choosePrivateKeyAlias API change
src/com/android/browser/Tab.java

packages/apps/Email
Tracking KeyChain.choosePrivateKeyAlias API change
src/com/android/email/view/CertificateSelector.java

packages/apps/KeyChain

KeyChain now depends on bouncycastle X509Name for formatting
X500Principals, since the 4 X500Principal formatting options could
not format emailAddress attributes in a human readable way and its
the most important attribute to display for client certificates in
most cases.
Android.mk

Changing the UI to a dialog, make the activity style transparent.
AndroidManifest.xml
res/values/styles.xml

Layout for chooser dialog
res/layout/cert_chooser.xml

Layout for list items in chooser
res/layout/cert_item.xml

New resources for dialog including comments for translators.
res/values/strings.xml

New dialog based KeyChainActivity. Now also shows requesting app
and requesting server. Now can preselect a specified alias. New
link directly to CertInstaller.

src/com/android/keychain/KeyChainActivity.java

Fix KeyChainTestActivity to work with TestKeyStore changes that
were causing network activity on the UI to look up the name of
localhost. Also track KeyChain.choosePrivateKeyAlias API change.

tests/src/com/android/keychain/tests/KeyChainTestActivity.java

Change-Id: I789faaf65cb36ddc16ce8cd1e8a803b0bde745e3
rc/com/android/certinstaller/CertFile.java
5ac873d6c63cf2bb6b173d11ce619808e261996e 20-Jun-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I710798b18709b5c70086690d3ea6e403db52b805
es/values-af/strings.xml
es/values-am/strings.xml
es/values-ms/strings.xml
es/values-sw/strings.xml
es/values-zu/strings.xml
2942ff86b52c8a12c5d137d94ce4a21300575887 07-Jun-2011 Brian Carlstrom <bdc@google.com> Move CredentialHelper.convertToPem to frameworks/base for reuse by KeyChain

Change-Id: I96d5a23201c070a7d0ce8856d189e54e3b05e3bd
rc/com/android/certinstaller/CredentialHelper.java
c8150af204ffd38ac46635ff8793261045490ea2 03-Jun-2011 Brian Carlstrom <bdc@google.com> Remove local reuse in CredentialHelper.isCa

While reviewing to isCa to understand how the NullPointerException
handling changed since Honeycomb, rewrite isCa to be clearer about
reusing local variables to be clearer about what is what and when.

Change-Id: Icf0c3d08666e2be18da4f12f93e92ab998d18fd7
rc/com/android/certinstaller/CredentialHelper.java
2aa55a29f1384da5fc574646c936760b67c205c9 31-May-2011 Brian Carlstrom <bdc@google.com> Integrating keystore with keyguard (Part 2 of 4)

Summary:

frameworks/base
keystore rewrite
keyguard integration with keystore on keyguard entry or keyguard change
KeyStore API simplification

packages/apps/Settings
Removed com.android.credentials.SET_PASSWORD intent support
Added keyguard requirement for keystore use

packages/apps/CertInstaller
Tracking KeyStore API changes
Fix for NPE in CertInstaller when certificate lacks basic constraints

packages/apps/KeyChain
Tracking KeyStore API changes

Details:

frameworks/base

Move keystore from C to C++ while rewriting password
implementation. Removed global variables. Added many comments.

cmds/keystore/Android.mk
cmds/keystore/keystore.h
cmds/keystore/keystore.c => cmds/keystore/keystore.cpp
cmds/keystore/keystore_cli.c => cmds/keystore/keystore_cli.cpp

Changed saveLockPattern and saveLockPassword to notify the keystore
on changes so that the keystore master key can be reencrypted when
the keyguard changes.

core/java/com/android/internal/widget/LockPatternUtils.java

Changed unlock screens to pass values for keystore unlock or initialization

policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java
policy/src/com/android/internal/policy/impl/PatternUnlockScreen.java

KeyStore API changes
- renamed test() to state(), which now return a State enum
- made APIs with byte[] key arguments private
- added new KeyStore.isEmpty used to determine if a keyguard is required

keystore/java/android/security/KeyStore.java

In addition to tracking KeyStore API changes, added new testIsEmpty
and improved some existing tests to validate expect values.

keystore/tests/src/android/security/KeyStoreTest.java

packages/apps/Settings

Removing com.android.credentials.SET_PASSWORD intent with the
removal of the ability to set an explicit keystore password now
that the keyguard value is used. Changed to ensure keyguard is
enabled for keystore install or unlock. Cleaned up interwoven
dialog handing into discrete dialog helper classes.

AndroidManifest.xml
src/com/android/settings/CredentialStorage.java

Remove layout for entering new password

res/layout/credentials_dialog.xml

Remove enable credentials checkbox

res/xml/security_settings_misc.xml
src/com/android/settings/SecuritySettings.java

Added ability to specify minimum quality key to ChooseLockGeneric
Activity. Used by CredentialStorage, but could also be used by
CryptKeeperSettings. Changed ChooseLockGeneric to understand
minimum quality for keystore in addition to DPM and device
encryption.

src/com/android/settings/ChooseLockGeneric.java

Changed to use getActivePasswordQuality from
getKeyguardStoredPasswordQuality based on experience in
CredentialStorage. Removed bogus class javadoc.

src/com/android/settings/CryptKeeperSettings.java

Tracking KeyStore API changes

src/com/android/settings/vpn/VpnSettings.java
src/com/android/settings/wifi/WifiSettings.java

Removing now unused string resources

res/values-af/strings.xml
res/values-am/strings.xml
res/values-ar/strings.xml
res/values-bg/strings.xml
res/values-ca/strings.xml
res/values-cs/strings.xml
res/values-da/strings.xml
res/values-de/strings.xml
res/values-el/strings.xml
res/values-en-rGB/strings.xml
res/values-es-rUS/strings.xml
res/values-es/strings.xml
res/values-fa/strings.xml
res/values-fi/strings.xml
res/values-fr/strings.xml
res/values-hr/strings.xml
res/values-hu/strings.xml
res/values-in/strings.xml
res/values-it/strings.xml
res/values-iw/strings.xml
res/values-ja/strings.xml
res/values-ko/strings.xml
res/values-lt/strings.xml
res/values-lv/strings.xml
res/values-ms/strings.xml
res/values-nb/strings.xml
res/values-nl/strings.xml
res/values-pl/strings.xml
res/values-pt-rPT/strings.xml
res/values-pt/strings.xml
res/values-rm/strings.xml
res/values-ro/strings.xml
res/values-ru/strings.xml
res/values-sk/strings.xml
res/values-sl/strings.xml
res/values-sr/strings.xml
res/values-sv/strings.xml
res/values-sw/strings.xml
res/values-th/strings.xml
res/values-tl/strings.xml
res/values-tr/strings.xml
res/values-uk/strings.xml
res/values-vi/strings.xml
res/values-zh-rCN/strings.xml
res/values-zh-rTW/strings.xml
res/values-zu/strings.xml
res/values/strings.xml

packages/apps/CertInstaller

Tracking KeyStore API changes
src/com/android/certinstaller/CertInstaller.java

Fix for NPE in CertInstaller when certificate lacks basic constraints
src/com/android/certinstaller/CredentialHelper.java

packages/apps/KeyChain

Tracking KeyStore API changes
src/com/android/keychain/KeyChainActivity.java
src/com/android/keychain/KeyChainService.java
support/src/com/android/keychain/tests/support/IKeyChainServiceTestSupport.aidl
support/src/com/android/keychain/tests/support/KeyChainServiceTestSupport.java
tests/src/com/android/keychain/tests/KeyChainServiceTest.java

Change-Id: I280f54b9305c3b5549ae2dfc8eb890493806cc78
rc/com/android/certinstaller/CertInstaller.java
rc/com/android/certinstaller/CredentialHelper.java
1871f8af5a58accceef372582913264619272d66 27-May-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I5de59f2671be0345f432588d9d5c53d988298fab
es/values-af/strings.xml
es/values-am/strings.xml
es/values-sw/strings.xml
es/values-zu/strings.xml
6b80d82a43499fcf8939c23e87a57297dfad9205 18-May-2011 Brian Carlstrom <bdc@google.com> Merge "Add support for .cer and .pfx for certificates and PKCS#12 files"
f3ece3c05b05b6780d9bee0dd90de0df891207e0 18-May-2011 Brian Carlstrom <bdc@google.com> Add support for .cer and .pfx for certificates and PKCS#12 files

Change-Id: Ie37afbb61aa4cdc52275d661232d188db125446d
rc/com/android/certinstaller/CertFile.java
ead4057af45c80af262613d93abd85c49ef98db2 18-May-2011 Brian Carlstrom <bdc@google.com> Move to KeyChain.bind

Change-Id: I7040a855705b72fcf5d7477db279affa6009bc72
rc/com/android/certinstaller/CertInstaller.java
30389d0148993679892385e007596a56ed46b6ac 18-May-2011 Brian Carlstrom <bdc@google.com> CertInstaller should use RESULT_OK to communicate success to callers

Change-Id: I6f25ffab113573169badd7cb116381f3412fbf31
rc/com/android/certinstaller/CertFile.java
rc/com/android/certinstaller/CertFileList.java
rc/com/android/certinstaller/CertInstaller.java
rc/com/android/certinstaller/CertInstallerMain.java
59f9a2721b1917c74e53f28f9d24e26e29fe0221 12-May-2011 Brian Carlstrom <bdc@google.com> Make CertInstaller installed CA certs trusted by applications via default TrustManager (3 of 6)

frameworks/base

Adding IKeyChainService APIs for CertInstaller and Settings use
keystore/java/android/security/IKeyChainService.aidl

libcore

Improve exceptions to include more information
luni/src/main/java/javax/security/auth/x500/X500Principal.java

Move guts of RootKeyStoreSpi to TrustedCertificateStore, leaving only KeyStoreSpi methods.
Added support for adding user CAs in a separate directory for system.
Added support for removing system CAs by placing a copy in a sytem directory
luni/src/main/java/org/apache/harmony/xnet/provider/jsse/RootKeyStoreSpi.java
luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustedCertificateStore.java

Formerly static methods on RootKeyStoreSpi are now instance methods on TrustedCertificateStore
luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerImpl.java

Added test for NativeCrypto.X509_NAME_hash_old and X509_NAME_hash
to make sure the implementing algorithms doe not change since
TrustedCertificateStore depend on X509_NAME_hash_old (OpenSSL
changed the algorithm from MD5 to SHA1 when moving from 0.9.8 to
1.0.0)

luni/src/test/java/org/apache/harmony/xnet/provider/jsse/NativeCryptoTest.java

Extensive test of new TrustedCertificateStore behavior
luni/src/test/java/org/apache/harmony/xnet/provider/jsse/TrustedCertificateStoreTest.java

TestKeyStore improvements
- Refactored TestKeyStore to provide simpler createCA method (and
internal createCertificate)
- Cleaned up to remove use of BouncyCastle specific X509Principal
in the TestKeyStore API when the public X500Principal would do.
- Cleaned up TestKeyStore support methods to not throw Exception
to remove need for static blocks for catch clauses in tests.

support/src/test/java/libcore/java/security/TestKeyStore.java
luni/src/test/java/libcore/java/security/KeyStoreTest.java
luni/src/test/java/org/apache/harmony/xnet/provider/jsse/NativeCryptoTest.java

Added private PKIXParameters contructor for use by
IndexedPKIXParameters to avoid wart of having to lookup and pass
a TrustAnchor to satisfy the super-class sanity check.

luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerImpl.java
luni/src/main/java/org/apache/harmony/xnet/provider/jsse/IndexedPKIXParameters.java
luni/src/main/java/java/security/cert/PKIXParameters.java

packages/apps/CertInstaller

Change CertInstaller to call IKeyChainService.installCertificate
for CA certs to pass them to the KeyChainServiceTest which will
make them available to all apps through the
TrustedCertificateStore. Change PKCS12 extraction to use AsyncTask.

src/com/android/certinstaller/CertInstaller.java

Added installCaCertsToKeyChain and hasCaCerts accessor for use by
CertInstaller. Use hasUserCertificate() internally. Cleanup coding
style.

src/com/android/certinstaller/CredentialHelper.java

packages/apps/KeyChain

Added MANAGE_ACCOUNTS so that IKeyChainService.reset
implementation can remove KeyChain accounts.

AndroidManifest.xml

Implement new IKeyChainService methods:
- Added IKeyChainService.installCaCertificate to install certs
provided by CertInstaller using the TrustedCertificateStore.
- Added IKeyChainService.reset to allow Settings to remove the
KeyChain accounts so that any app granted access to keystore
credentials are revoked when the keystore is reset.

src/com/android/keychain/KeyChainService.java

packages/apps/Settings

Changed com.android.credentials.RESET credential reset action to
also call IKeyChainService.reset to remove any installed user CAs
and remove KeyChain accounts to have AccountManager revoke
credential granted to private keys removed during the RESET.

src/com/android/settings/CredentialStorage.java

Added toast text value for failure case

res/values/strings.xml

system/core

Have init create world readable /data/misc/keychain to allow apps
to access user added CA certificates installed by the CertInstaller.

rootdir/init.rc

Change-Id: Idc4e6dd927cf829268a684061e14412623f89d80
rc/com/android/certinstaller/CertInstaller.java
rc/com/android/certinstaller/CredentialHelper.java
d54f61431155eb39d39e7b0b5f5fe6a02f746c85 30-Mar-2011 Eric Fischer <enf@google.com> am be487837: (-s ours) am 1c4482b9: am a54fd499: (-s ours) Import revised translations. DO NOT MERGE

* commit 'be487837e43f65cd02b55aa4fcd3db4cdbcee9fd':
Import revised translations. DO NOT MERGE
be487837e43f65cd02b55aa4fcd3db4cdbcee9fd 29-Mar-2011 Eric Fischer <enf@google.com> am 1c4482b9: am a54fd499: (-s ours) Import revised translations. DO NOT MERGE

* commit '1c4482b9e18957f2a61ad801fefc78fc37d3515f':
Import revised translations. DO NOT MERGE
1c4482b9e18957f2a61ad801fefc78fc37d3515f 29-Mar-2011 Eric Fischer <enf@google.com> am a54fd499: (-s ours) Import revised translations. DO NOT MERGE

* commit 'a54fd4999d50c0f69dfe0c0922387b1f4ab30cbc':
Import revised translations. DO NOT MERGE
a54fd4999d50c0f69dfe0c0922387b1f4ab30cbc 29-Mar-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I52c503a1120388cc3026e3c803c6b2776735252d
es/values-de/strings.xml
29e7503124809b7f2822b4da0e988c8441b38b9f 19-Mar-2011 Eric Fischer <enf@google.com> am 2d4e9181: (-s ours) am 3e3fbce3: (-s ours) am 457ffda6: Import revised translations. DO NOT MERGE

* commit '2d4e91818332c9ca36f0967997fd3690a0799839':
Import revised translations. DO NOT MERGE
2d4e91818332c9ca36f0967997fd3690a0799839 19-Mar-2011 Eric Fischer <enf@google.com> am 3e3fbce3: (-s ours) am 457ffda6: Import revised translations. DO NOT MERGE

* commit '3e3fbce3f7cd5dacd661d48774d10979c47ec030':
Import revised translations. DO NOT MERGE
3e3fbce3f7cd5dacd661d48774d10979c47ec030 19-Mar-2011 Eric Fischer <enf@google.com> am 457ffda6: Import revised translations. DO NOT MERGE

* commit '457ffda6726b8e0f88d78a9267b840d102a8907a':
Import revised translations. DO NOT MERGE
457ffda6726b8e0f88d78a9267b840d102a8907a 18-Mar-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: Ie01d7156414d799e750c7cd33915db97d9abfaea
es/values-de/strings.xml
29f512336b7ac28e8f36a3665c106f3c5f6454ce 15-Mar-2011 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I3538d3e687a76aca8d817baabf4b11b7622161c8
es/values-de/strings.xml
49f073b877a14b67ec4c734ecaa55ca14df96854 04-Mar-2011 Eric Fischer <enf@google.com> am e6a72e70: (-s ours) Import revised translations. DO NOT MERGE

* commit 'e6a72e706432c1dcf3b020ee9122ec5c11ad309e':
Import revised translations. DO NOT MERGE
e6a72e706432c1dcf3b020ee9122ec5c11ad309e 03-Mar-2011 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I6ae874c592f5ae7a9a9495ad13b752f0e0fee4f1
es/values-de/strings.xml
617fd344778e60de065abc9fb1ece50680c9cc87 30-Jan-2011 The Android Open Source Project <initial-contribution@android.com> Mass merge from gingerbread - do not merge

Change-Id: I8e309bcb58f108e57fe2651b49642a1a28fd18bb
1d20e602b0ad79ca2909abd74c07d2edde208771 30-Jan-2011 The Android Open Source Project <initial-contribution@android.com> Reconcile gingerbread-plus-aosp and honeycomb

Change-Id: I608cb1d9d9bfab7fae7f3522aefd3ca2f682c64e
6dff1ce8cc4a1a7d66d7f4e269e81146b9aad8d9 25-Jan-2011 Eric Fischer <enf@google.com> am ed62f82e: (-s ours) Import translations for additional languages.

* commit 'ed62f82e5efc05ff87133fad7f4051a7e0fb9788':
Import translations for additional languages.
64d3e966ebaa893c6ae6e4a066a2d289b6b48521 25-Jan-2011 Brian Carlstrom <bdc@google.com> am 1415616f: Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle

* commit '1415616fbef76346e586b927fada32f6ccdc6091':
Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle
1415616fbef76346e586b927fada32f6ccdc6091 25-Jan-2011 Brian Carlstrom <bdc@google.com> Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle

Bug: 3086427
Change-Id: Ic1a08a990af04263dab98853174fe5cfaeb5c219
rc/com/android/certinstaller/CredentialHelper.java
e8dc25136f7a7ad8f50b3811b5dd2aeef70f8e17 20-Jan-2011 Chia-chi Yeh <chiachi@android.com> am 192624b5: Update the intent path.

* commit '192624b5076b440b3cb78d4332402a21c93a6b07':
Update the intent path.
192624b5076b440b3cb78d4332402a21c93a6b07 20-Jan-2011 Chia-chi Yeh <chiachi@android.com> Update the intent path.

Change-Id: I1a1d8c2acce19d6db98d3a0950743aab3d4af46e
rc/com/android/certinstaller/CredentialHelper.java
6858223cb4502fac698e9a960e6d7f26b44f1f1c 07-Jan-2011 shared_user android-merger-prebuild <android-merger@google.com> Merge commit '1c0e598a' into honeycomb-plus-aosp
1c0e598a40acfcc57d267492e89c0f9d86f15a7a 07-Jan-2011 Eric Fischer <enf@google.com> am ed62f82e: Import translations for additional languages.

* commit 'ed62f82e5efc05ff87133fad7f4051a7e0fb9788':
Import translations for additional languages.
ed62f82e5efc05ff87133fad7f4051a7e0fb9788 06-Jan-2011 Eric Fischer <enf@google.com> Import translations for additional languages.

Change-Id: Ia967dacdafe5a974617fff5a145a38711cc0c1f5
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-en-rGB/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-iw/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-rm/strings.xml
es/values-ro/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
453d10c91d9fdb343545965c0a9effacea6a6f7a 06-Jan-2011 Chung-yih Wang <cywang@google.com> Fix the crash bug for CertInstaller.

bug:3290032
Change-Id: I2a1927d417c529967a78c7312485e36bc3349834
ndroidManifest.xml
es/values/styles.xml
6c70ab2f377af16c4ef6e7b6320bca8c99904bd8 23-Dec-2010 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I889a268d688256c83c3bd1ecef3a0f193b7d6d82
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-en-rGB/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-in/strings.xml
es/values-iw/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ro/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
b644843905e6605a5d5fe6c16c1aebfb5b175e30 02-Dec-2010 Eric Fischer <enf@google.com> Rename Indonesian and Hebrew translations to match Locale.java conventions

Change-Id: Ia434d0798ca4ce088d1669f683549f097b45f096
es/values-he/strings.xml
es/values-id/strings.xml
es/values-in/strings.xml
es/values-iw/strings.xml
9e7d5195f12519206a4febb72c9a7c053a69bc20 25-Nov-2010 Jean-Baptiste Queru <jbq@google.com> am 93f11ccc: am 9193d8bc: Merge "code cleanup : unused import statement, local vars and static finals."

* commit '93f11ccc2a6b85ff30ebb38fbc11d2d0ea464ab6':
code cleanup : unused import statement, local vars and static finals.
93f11ccc2a6b85ff30ebb38fbc11d2d0ea464ab6 25-Nov-2010 Jean-Baptiste Queru <jbq@google.com> am 9193d8bc: Merge "code cleanup : unused import statement, local vars and static finals."

* commit '9193d8bcca6a02f92250ed4796908c6561c32945':
code cleanup : unused import statement, local vars and static finals.
9193d8bcca6a02f92250ed4796908c6561c32945 25-Nov-2010 Jean-Baptiste Queru <jbq@google.com> Merge "code cleanup : unused import statement, local vars and static finals."
7a49d0d7ba85a224aabf39fec3f8666109aa943d 18-Nov-2010 Eric Fischer <enf@google.com> Import initial translations for 20 new locales.

Change-Id: I620c4a0e6916eaf051ca986a28e35997169d8b31
es/values-ar/strings.xml
es/values-bg/strings.xml
es/values-ca/strings.xml
es/values-en-rGB/strings.xml
es/values-fa/strings.xml
es/values-fi/strings.xml
es/values-he/strings.xml
es/values-hr/strings.xml
es/values-hu/strings.xml
es/values-id/strings.xml
es/values-lt/strings.xml
es/values-lv/strings.xml
es/values-ro/strings.xml
es/values-sk/strings.xml
es/values-sl/strings.xml
es/values-sr/strings.xml
es/values-th/strings.xml
es/values-tl/strings.xml
es/values-uk/strings.xml
es/values-vi/strings.xml
07ce61d4f3dd603f902bc9afe3e82ede6c0c3555 12-Nov-2010 Eric Fischer <enf@google.com> am 5e875d71: (-s ours) Import revised translations. DO NOT MERGE

* commit '5e875d71d04f191871faf6d02ee6353f50b04238':
Import revised translations. DO NOT MERGE
ac0b99621962d0e7cd067c4ea6085955dffbc72b 10-Nov-2010 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: Id4186a7e94fdfa2f6afdc45d4e462a9b3624fa7d
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-rm/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
5e875d71d04f191871faf6d02ee6353f50b04238 09-Nov-2010 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: Iff08dd00d3ee5559d64ffcf239abd9794ee23700
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
3e17f9f04b9f7d153757bfd2f34a5fe60698adcb 06-Nov-2010 Mohammad Shamsi <m.h.shams@gmail.com> code cleanup : unused import statement, local vars and static finals.

Change-Id: I49b96ce37385989fb2208cecbf4cddcdd0e0d240
rc/com/android/certinstaller/CertFile.java
rc/com/android/certinstaller/CertFileList.java
rc/com/android/certinstaller/CredentialHelper.java
rc/com/android/certinstaller/Util.java
0309e61e3922be78a7daaa4a16e9cecb5f440382 27-Oct-2010 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I5a981c7cc99b80c2c7b8de1e19503cf39b50fc18
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
184c46113f68406fa25ad1af929a346245c37f48 27-Oct-2010 Eric Fischer <enf@google.com> am 725209d7: (-s ours) Import revised translations. DO NOT MERGE
725209d73ecbe044d6952568e93f4723eff3dccf 27-Oct-2010 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: Ib62d8359cb5794f04cb5a4850b72982c11a20db8
es/values-es/strings.xml
20b4c01ac3dbdc67e424c98a29e7abbfbd1ced3a 26-Oct-2010 John Huang <jsh@google.com> am 95ae8966: Merge "Use explicit intent for installing system credentials" into gingerbread
95ae8966807ac324c688737c00e2f6882d1a99fc 26-Oct-2010 John Huang <jsh@google.com> Merge "Use explicit intent for installing system credentials" into gingerbread
6ed6d465ff2b460e5517db3c7136a417dc77b410 26-Oct-2010 Hung-ying Tyan <tyanh@google.com> Use explicit intent for installing system credentials

Bug: 3020049
Change-Id: Iae999db70ee1a4e12d660c9335232b2429b8a5db
rc/com/android/certinstaller/CredentialHelper.java
ee2739ac1489246b72757b09654b96eabd25c5a6 26-Oct-2010 Eric Fischer <enf@google.com> am eda477c1: (-s ours) Import revised translations. DO NOT MERGE

Merge commit 'eda477c13a7f85bea41b9732ea834f8bc099cb65'

* commit 'eda477c13a7f85bea41b9732ea834f8bc099cb65':
Import revised translations. DO NOT MERGE
eda477c13a7f85bea41b9732ea834f8bc099cb65 26-Oct-2010 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I5c8a8e62298dead0ea07e31f29f24f487a67a8f2
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
32a4435ef9df9b4ccaa699cb5648151ef8a6d4a5 21-Oct-2010 Eric Fischer <enf@google.com> am cccceb91: Replace shared storage with USB storage.

Merge commit 'cccceb9167ce33702fba2c3b4e50a85e19d6e98b'

* commit 'cccceb9167ce33702fba2c3b4e50a85e19d6e98b':
Replace shared storage with USB storage.
cccceb9167ce33702fba2c3b4e50a85e19d6e98b 20-Oct-2010 Eric Fischer <enf@google.com> Replace shared storage with USB storage.

Change-Id: Id5f1354d64da3fe0d5a4c0253a9087212e5b5f21
es/values/strings.xml
d6af74636fa489d193ce9eb315ad9d5f0f16e9a9 18-Oct-2010 Kenny Root <kroot@google.com> am e1eb78a0: (-s ours) Import revised translations DO NOT MERGE

Merge commit 'e1eb78a0b8a17efbeeabf3b07d0d219729cadc12'

* commit 'e1eb78a0b8a17efbeeabf3b07d0d219729cadc12':
Import revised translations DO NOT MERGE
b489f9c4a8db66b420bef61bab562daa58b69a24 16-Oct-2010 Kenny Root <kroot@google.com> am 258246bb: (-s ours) Import revised translations

Merge commit '258246bbace09094c24ffc49b115a52b227f791c'

* commit '258246bbace09094c24ffc49b115a52b227f791c':
Import revised translations
e1eb78a0b8a17efbeeabf3b07d0d219729cadc12 16-Oct-2010 Kenny Root <kroot@google.com> Import revised translations DO NOT MERGE

Change-Id: I6bf2d2302a4b735132fa33ad3c626a8ce1ea6b5a
es/values-sv/strings.xml
258246bbace09094c24ffc49b115a52b227f791c 14-Oct-2010 Kenny Root <kroot@google.com> Import revised translations

Change-Id: I7576628b3f444ce147e9de83824c7fe300b62a10
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
db34b45c32daa9f88bcda89c3196ef76ea4ac48e 01-Oct-2010 Eric Fischer <enf@google.com> am 783984cc: (-s ours) Import revised translations. DO NOT MERGE

Merge commit '783984cc56e5d138afe8d3c864c59a0a6d8635c4'

* commit '783984cc56e5d138afe8d3c864c59a0a6d8635c4':
Import revised translations. DO NOT MERGE
e1ed06c431a1ac55d69bef771d86d2ebbfd197d4 30-Sep-2010 Eric Fischer <enf@google.com> am 229e758b: Split strings with SD card references into variations.

Merge commit '229e758bcecfe03177102d6d4b7ac65483b465f1'

* commit '229e758bcecfe03177102d6d4b7ac65483b465f1':
Split strings with SD card references into variations.
783984cc56e5d138afe8d3c864c59a0a6d8635c4 29-Sep-2010 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Change-Id: I416eed53c3f4da6a5d008186dd8c49ebecfcdd58
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
229e758bcecfe03177102d6d4b7ac65483b465f1 29-Sep-2010 Eric Fischer <enf@google.com> Split strings with SD card references into variations.

Change-Id: I5b8cfb8e121074c065c746118faa1162ff46e5ad
es/values/strings.xml
23463775292a78e73a1a18f731443120b08e4146 17-Aug-2010 Hung-ying Tyan <tyanh@google.com> am ab1f4fca: Fix string description.

Merge commit 'ab1f4fcabecce7e9b52f5fd968fb5d3f4072721a'

* commit 'ab1f4fcabecce7e9b52f5fd968fb5d3f4072721a':
Fix string description.
ab1f4fcabecce7e9b52f5fd968fb5d3f4072721a 17-Aug-2010 Hung-ying Tyan <tyanh@google.com> Fix string description.

http://b/issue?id=2918702

Change-Id: Ice5dfdc7fbe4ede8831ef7149e36ab4c320191ce
es/values/strings.xml
4aa3e4c42da7dcd0524dc71bf4cbf5f6bc83d3b5 06-Aug-2010 Eric Fischer <enf@google.com> Import revised translations.

Change-Id: I8fba81abbb64f27ffced73832f1ea0c5454b3575
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
d948bd209e31c3d54d0b363e377810150206948a 05-Aug-2010 Brian Carlstrom <bdc@google.com> am 3d8a0edf: Tracking merge of dalvik-dev to gingerbread

Merge commit '3d8a0edfd255db3b0523521c58c6aa1e9f991005'

* commit '3d8a0edfd255db3b0523521c58c6aa1e9f991005':
Tracking merge of dalvik-dev to gingerbread
3d8a0edfd255db3b0523521c58c6aa1e9f991005 05-Aug-2010 Brian Carlstrom <bdc@google.com> Tracking merge of dalvik-dev to gingerbread

git cherry-pick --no-commit a09a69aa107bf1ae186d32f0cf33c07af2644486

Change-Id: I0a964afdf9b982aba22e7d9dfb558c6ad91c6482
ndroid.mk
a09a69aa107bf1ae186d32f0cf33c07af2644486 30-Jun-2010 Brian Carlstrom <bdc@google.com> Add explict dependency on bouncycastle from CertificateInstaller

Change-Id: I34b8edb51847f0e77c4d837210230667589a126c
ndroid.mk
cddc01203e7f52b05dc9599851c8421f1afb5e99 21-Jun-2010 Kenny Root <kroot@google.com> am bdd13bfa: Import revised translations

Merge commit 'bdd13bfab99604e3bd51d8f892c90253a36e638c'

* commit 'bdd13bfab99604e3bd51d8f892c90253a36e638c':
Import revised translations
bdd13bfab99604e3bd51d8f892c90253a36e638c 21-Jun-2010 Kenny Root <kroot@google.com> Import revised translations

Change-Id: I9c02ff3ba4dbf67021128bfb20e38271feb2275b
es/values-nb/strings.xml
8eeadc240ebdeb5274035b3d1158d8e907897970 09-Jun-2010 Hung-ying Tyan <tyanh@google.com> CertInstaller: fix crash on invalid certificate

Change-Id: I527c328b76b66357fec6127b79f314c8ebf90b7c
es/values/strings.xml
rc/com/android/certinstaller/CertInstaller.java
rc/com/android/certinstaller/CredentialHelper.java
cb944a236fb05b651fd1e312d0df79df98edc3be 17-May-2010 Kenny Root <kroot@google.com> Import revised translations

Change-Id: I2332c5497ccb691f0dab65a3c6b8424f38a604c4
es/values-de/strings.xml
9921a06c00702842909eac440caa7d4e33908107 18-Mar-2010 Kenny Root <kroot@google.com> Import revised translations

Change-Id: I2c97a1e2fa62ad0b0dbec0c32747bb81769b9e09
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
6924739ff4bb130a594f3d63e78d0344e7fc9abb 09-Mar-2010 Jean-Baptiste Queru <jbq@google.com> Add an empty CleanSpec.mk

Change-Id: I8bbceb7519a18d22b17d2458121d4c5c287e6e3d
leanSpec.mk
3afef6cab231210a66aa12ab398eca8ea908888a 04-Mar-2010 Eric Fischer <enf@google.com> Import new translations
es/values-zh-rTW/strings.xml
b312ea7d55ab6f65b45d0071434ca1dce7cbe6e9 27-Feb-2010 Eric Fischer <enf@google.com> Import new translations.
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
a99720d90277157f9c0a2b19100ab9a36e597013 11-Feb-2010 Jeff Hamilton <jham@android.com> Add an original-package tag that matches the real package name.

Change-Id: I7bd9c5949d4b7f8e60ec15902d57cf0b14d9c9d5
ndroidManifest.xml
832878cac1a136b1952de51cc2417d4e18188403 11-Feb-2010 Hung-ying Tyan <tyanh@google.com> Fix two certinstaller bugs.

+ Certinstaller does not handle key pair correctly when keystore is locked.
http://b/issue?id=2351926
+ Certinstaller crashes when installing from SD card where the "download"
folder does not exist.
+ Remove redundant res IDs.
es/layout/name_credential_dialog.xml
rc/com/android/certinstaller/CertFile.java
rc/com/android/certinstaller/CertInstaller.java
81dc74774d2f48a14fd2099882e2e91e4979c9d6 05-Feb-2010 The Android Open Source Project <initial-contribution@android.com> am 887c02e6: am 70fa371f: reconcile main tree with open-source eclair

Merge commit '887c02e675c3eb728571aae3d17b2c3bf72cd939'

* commit '887c02e675c3eb728571aae3d17b2c3bf72cd939':
android-2.1_r1 snapshot
887c02e675c3eb728571aae3d17b2c3bf72cd939 05-Feb-2010 The Android Open Source Project <initial-contribution@android.com> am 70fa371f: reconcile main tree with open-source eclair

Merge commit '70fa371f561b8e838630ba3240ce01d8ed555aa7' into eclair-plus-aosp

* commit '70fa371f561b8e838630ba3240ce01d8ed555aa7':
android-2.1_r1 snapshot
70fa371f561b8e838630ba3240ce01d8ed555aa7 05-Feb-2010 The Android Open Source Project <initial-contribution@android.com> reconcile main tree with open-source eclair
c993eafbeee0d61e0a11a12742276bbdf454a68c 29-Jan-2010 The Android Open Source Project <initial-contribution@android.com> reconcile android-2.1_r1 snapshot
f570d022453f102617024ada86a8921858889d14 28-Jan-2010 The Android Open Source Project <initial-contribution@android.com> am cfc2ad81: merge from open-source master

Merge commit 'cfc2ad8148d4d0a857eb4f5f85c34bf955907a2f'

* commit 'cfc2ad8148d4d0a857eb4f5f85c34bf955907a2f':
empty initial commit
cfc2ad8148d4d0a857eb4f5f85c34bf955907a2f 21-Jan-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master
39c365dd8d5910a484019106ea7eaa4e679cb1b9 13-Jan-2010 The Android Open Source Project <initial-contribution@android.com> android-2.1_r1 snapshot
ndroid.mk
ndroidManifest.xml
ODULE_LICENSE_APACHE2
OTICE
es/layout/name_credential_dialog.xml
es/layout/password_dialog.xml
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
es/values/colors.xml
es/values/dimens.xml
es/values/strings.xml
es/xml/pick_file_pref.xml
rc/com/android/certinstaller/CertInstaller.java
7e26374e4d7492584573180641191d140f8a2663 11-Jan-2010 The Android Open Source Project <initial-contribution@android.com> empty initial commit
8ef31d45ed38b7094ea396fbed93248d535fb316 09-Jan-2010 Romain Guy <romainguy@android.com> Deprecate fill_parent and introduce match_parent.
Bug: #2361749.
es/layout/name_credential_dialog.xml
es/layout/password_dialog.xml
f9f958f017590affd9d19072b8c7b4fb82fb121b 08-Jan-2010 Eric Fischer <enf@google.com> Update with latest translations.
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
319ac90decf180736e8ab73933e611b4c7d4d1ba 06-Jan-2010 Jean-Baptiste Queru <jbq@google.com> Do not use a user tag on apps, as it is ignored.

The build system does not honor user tags on apps,
and setting it is misleading.

This removes the confusion by making the makefiles
behave like they read.

Change-Id: I88c7015ed7f9facb5e17a6d0e1a26b65f42765bb
ndroid.mk
73d9e57885f31afc33cd54c4cea60864cea56bc6 14-Nov-2009 Eric Fischer <enf@google.com> am 7f3093d6: (-s ours) am 3878fe90: (-s ours) Import revised translations. DO NOT MERGE

Merge commit '7f3093d6f907769fec38a386ffd004930b489d33'

* commit '7f3093d6f907769fec38a386ffd004930b489d33':
Import revised translations. DO NOT MERGE
7f3093d6f907769fec38a386ffd004930b489d33 14-Nov-2009 Eric Fischer <enf@google.com> am 3878fe90: (-s ours) Import revised translations. DO NOT MERGE

Merge commit '3878fe90c0040e576930d7553776ccc5e7fe4f2f' into eclair-mr2

* commit '3878fe90c0040e576930d7553776ccc5e7fe4f2f':
Import revised translations. DO NOT MERGE
3878fe90c0040e576930d7553776ccc5e7fe4f2f 14-Nov-2009 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Approver: jerryw
es/values-zh-rCN/strings.xml
6d9082c9f3d7927eb8310f4831074435095cdb0a 07-Nov-2009 Eric Fischer <enf@google.com> am ff362b2f: (-s ours) Import revised translations. DO NOT MERGE

Merge commit 'ff362b2f60e61b27ecccd3cd09665d9aab6c2715'

* commit 'ff362b2f60e61b27ecccd3cd09665d9aab6c2715':
Import revised translations. DO NOT MERGE
ff362b2f60e61b27ecccd3cd09665d9aab6c2715 07-Nov-2009 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
de13460ca20faddf09bf3e21c2a1812ca8c422ec 26-Oct-2009 Hung-ying Tyan <tyanh@google.com> am f14ac602: Merge change I7822c9e4 into eclair-mr2

Merge commit 'f14ac602eefabbb49eb7d6ada92408386b02356b'

* commit 'f14ac602eefabbb49eb7d6ada92408386b02356b':
Handling missing sd card in certinstaller.
46437fca2769c8f5055d800ab4b8ba4468e9ebe7 26-Oct-2009 Hung-ying Tyan <tyanh@google.com> am 8f346771: Merge change I7b4cee91 into eclair-mr2

Merge commit '8f34677137be397d59f8aa2ebef9ab507d0a3a0e'

* commit '8f34677137be397d59f8aa2ebef9ab507d0a3a0e':
Add support for installing certs in PEM from SD card
f14ac602eefabbb49eb7d6ada92408386b02356b 26-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I7822c9e4 into eclair-mr2

* changes:
Handling missing sd card in certinstaller.
8f34677137be397d59f8aa2ebef9ab507d0a3a0e 26-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I7b4cee91 into eclair-mr2

* changes:
Add support for installing certs in PEM from SD card
d674440a49f278793aa2a2bb01c231f8cea7f8c0 24-Oct-2009 Hung-ying Tyan <tyanh@google.com> Handling missing sd card in certinstaller.

http://b/issue?id=2211438
es/values-es-rUS/strings.xml
es/values/strings.xml
rc/com/android/certinstaller/CertFile.java
rc/com/android/certinstaller/CertFileList.java
rc/com/android/certinstaller/CertInstallerMain.java
rc/com/android/certinstaller/Util.java
7b4cee910e1e755d2f0468a5f79aaa97e926a3a9 23-Oct-2009 Hung-ying Tyan <tyanh@google.com> Add support for installing certs in PEM from SD card
rc/com/android/certinstaller/CertFile.java
rc/com/android/certinstaller/CertFileList.java
175090d39c7e68c02ec24c64c528f80b32f714ec 22-Oct-2009 Eric Fischer <enf@google.com> am 9905b0c9: (-s ours) am 639674a0: (-s ours) Import revised translations. DO NOT MERGE

Merge commit '9905b0c9833640a586da039f3c92a7b133824d34'

* commit '9905b0c9833640a586da039f3c92a7b133824d34':
Import revised translations. DO NOT MERGE
9905b0c9833640a586da039f3c92a7b133824d34 22-Oct-2009 Eric Fischer <enf@google.com> am 639674a0: (-s ours) Import revised translations. DO NOT MERGE

Merge commit '639674a0c2895882c535a80403dc1181965ed6f1' into eclair-mr2

* commit '639674a0c2895882c535a80403dc1181965ed6f1':
Import revised translations. DO NOT MERGE
89edda8ada7844801da28daedbd0761d65e3cc70 22-Oct-2009 Hung-ying Tyan <tyanh@google.com> am 3e722cad: An overhaul on certinstaller.

Merge commit '3e722cadf66802194267460fe5de77e6c18530eb'

* commit '3e722cadf66802194267460fe5de77e6c18530eb':
An overhaul on certinstaller.
3e722cadf66802194267460fe5de77e6c18530eb 15-Oct-2009 Hung-ying Tyan <tyanh@google.com> An overhaul on certinstaller.

* Fix state handling, identifying first-time-only execution etc.
* Fix the case where more than one alias exists in a pkcs12 keystore.
(http://b/issue?id=2202474)
* Improve UX: go ahead to install when there's only one cert file on SD card.
* Improve UX: make background transparent when not browsing files.
* Break the code into multiple activies and helper classes.
ndroidManifest.xml
rc/com/android/certinstaller/CertFile.java
rc/com/android/certinstaller/CertFileList.java
rc/com/android/certinstaller/CertInstaller.java
rc/com/android/certinstaller/CertInstallerMain.java
rc/com/android/certinstaller/CredentialHelper.java
rc/com/android/certinstaller/Util.java
rc/com/android/certinstaller/ViewHelper.java
639674a0c2895882c535a80403dc1181965ed6f1 21-Oct-2009 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Approver: jerryw
es/values-cs/strings.xml
es/values-da/strings.xml
es/values-de/strings.xml
es/values-el/strings.xml
es/values-es-rUS/strings.xml
es/values-es/strings.xml
es/values-fr/strings.xml
es/values-it/strings.xml
es/values-ja/strings.xml
es/values-ko/strings.xml
es/values-nb/strings.xml
es/values-nl/strings.xml
es/values-pl/strings.xml
es/values-pt-rPT/strings.xml
es/values-pt/strings.xml
es/values-ru/strings.xml
es/values-sv/strings.xml
es/values-tr/strings.xml
es/values-zh-rCN/strings.xml
es/values-zh-rTW/strings.xml
7366d1c8df1586cd36e5b85a219fb06c3cc3698c 14-Oct-2009 Eric Fischer <enf@google.com> am b10b1efd: (-s ours) Import revised translations. DO NOT MERGE

Merge commit 'b10b1efd5275764ef1eed038601fa1fa6d2e97e9'

* commit 'b10b1efd5275764ef1eed038601fa1fa6d2e97e9':
Import revised translations. DO NOT MERGE
c63897d6ab0a27b9634a66e89a677a28df8e3d6b 14-Oct-2009 Eric Fischer <enf@google.com> am 4c5770b6: (-s ours) am a0fbbc45: (-s ours) Import revised translations. DO NOT MERGE

Merge commit '4c5770b652c7f7048b306242ee529b846d3e25ea'

* commit '4c5770b652c7f7048b306242ee529b846d3e25ea':
Import revised translations. DO NOT MERGE
e0cf8f18991e176a87fecfdb160162aef488d66d 14-Oct-2009 Eric Fischer <enf@google.com> Reimport translations.
es/values-es-rUS/strings.xml
b10b1efd5275764ef1eed038601fa1fa6d2e97e9 14-Oct-2009 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE
es/values-es-rUS/strings.xml
4c5770b652c7f7048b306242ee529b846d3e25ea 10-Oct-2009 Eric Fischer <enf@google.com> am a0fbbc45: (-s ours) Import revised translations. DO NOT MERGE

Merge commit 'a0fbbc45e53d22b429b9a28e74510051738f2b4c' into eclair-mr2

* commit 'a0fbbc45e53d22b429b9a28e74510051738f2b4c':
Import revised translations. DO NOT MERGE
a0fbbc45e53d22b429b9a28e74510051738f2b4c 10-Oct-2009 Eric Fischer <enf@google.com> Import revised translations. DO NOT MERGE

Approver: jerryw
es/values-es-rUS/strings.xml
2767482fa00ffd4942976f150cafce82565d1c0d 01-Oct-2009 Hung-ying Tyan <tyanh@google.com> am 1c0ebf45: Fix a bug where dialog is reopened when app dies.

Merge commit '1c0ebf4585c9cf9c0a451b46bb237b92c14dfe07'

* commit '1c0ebf4585c9cf9c0a451b46bb237b92c14dfe07':
Fix a bug where dialog is reopened when app dies.
5a355e0d97caae9d59168091820ec9af8398f650 01-Oct-2009 Hung-ying Tyan <tyanh@google.com> am d9cbc585: Some minor fixes.

Merge commit 'd9cbc585f14dfde2f226fa172d335666424fd3fb'

* commit 'd9cbc585f14dfde2f226fa172d335666424fd3fb':
Some minor fixes.
0070fe634a1db81ddaef85beae62838c081a2092 01-Oct-2009 Hung-ying Tyan <tyanh@google.com> am c87a48ac: Fix the issue where cert comes later than keypair.

Merge commit 'c87a48ac1c22403b690330f0cf7a1890f9a0c4eb'

* commit 'c87a48ac1c22403b690330f0cf7a1890f9a0c4eb':
Fix the issue where cert comes later than keypair.
1c0ebf4585c9cf9c0a451b46bb237b92c14dfe07 01-Oct-2009 Hung-ying Tyan <tyanh@google.com> Fix a bug where dialog is reopened when app dies.
rc/com/android/certinstaller/CertInstaller.java
d9cbc585f14dfde2f226fa172d335666424fd3fb 30-Sep-2009 Hung-ying Tyan <tyanh@google.com> Some minor fixes.

* Sdcard --> SdCard.
* change some variable names to more descriptive ones.
* check isFinishing() in createFileList().
* throw a toast when no pkcs12 file is found on sdcard.
es/values/strings.xml
rc/com/android/certinstaller/CertInstaller.java
c87a48ac1c22403b690330f0cf7a1890f9a0c4eb 28-Sep-2009 Hung-ying Tyan <tyanh@google.com> Fix the issue where cert comes later than keypair.
ndroidManifest.xml
es/layout/name_credential_dialog.xml
es/layout/name_credential_dialog_view.xml
es/layout/password_dialog.xml
es/values/strings.xml
es/xml/pick_file_pref.xml
rc/com/android/certinstaller/CertInstaller.java
88b9d011c2c990c70f16db04159e7261430fe2d8 25-Sep-2009 Chia-chi Yeh <chiachi@android.com> am bedff945: CertInstaller: remove wrong import entries.

Merge commit 'bedff945a7dffd019035154f78018b350e47ee66'

* commit 'bedff945a7dffd019035154f78018b350e47ee66':
CertInstaller: remove wrong import entries.
7d51e4953de2ebd7cafdd97f74ae0077539e3dbf 25-Sep-2009 Chung-yih Wang <cywang@google.com> am 338b375c: Just change to an empty class for fixing the filename issue.

Merge commit '338b375c3a5e89edbfb235629834c9d684a3ddeb'

* commit '338b375c3a5e89edbfb235629834c9d684a3ddeb':
Just change to an empty class for fixing the filename issue.
bedff945a7dffd019035154f78018b350e47ee66 24-Sep-2009 Chia-chi Yeh <chiachi@android.com> CertInstaller: remove wrong import entries.
rc/com/android/certinstaller/CertInstaller.java
338b375c3a5e89edbfb235629834c9d684a3ddeb 24-Sep-2009 Chung-yih Wang <cywang@google.com> Just change to an empty class for fixing the filename issue.
rc/com/android/certinstaller/CertInstaller.java
446384a53a05ece09f1b4c141580706e4f741f9d 17-Sep-2009 Hung-ying Tyan <tyanh@google.com> am 6765abbe: Initial implementation of CertInstaller

Merge commit '6765abbeac1c2902cc4efaa55ffefb9c3221fe0e'

* commit '6765abbeac1c2902cc4efaa55ffefb9c3221fe0e':
Initial implementation of CertInstaller
6765abbeac1c2902cc4efaa55ffefb9c3221fe0e 15-Sep-2009 Hung-ying Tyan <tyanh@google.com> Initial implementation of CertInstaller
ndroid.mk
ndroidManifest.xml
ODULE_LICENSE_APACHE2
OTICE
es/layout/name_credential_dialog_view.xml
es/values/colors.xml
es/values/dimens.xml
es/values/strings.xml
rc/com/android/certinstaller/CertInstaller.java
0a3949e2e104e11ad7d6452016e2f61bc317d6e8 09-Sep-2009 Hung-ying Tyan <tyanh@google.com> Add license files to the project.
ODULE_LICENSE_APACHE2
OTICE
5362a7483929c83d0337b2d5f4ea58b49f915d2c 09-Sep-2009 android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> new project, first commit