summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | am 2b802ceb: (-s ours) am cd6e6034: (-s ours) am d0d54fc1: (-s ours) Import ↵Baligh Uddin2015-09-270-0/+0
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '2b802ceb328658fa18e007f859bda47a755dce30': Import translations. DO NOT MERGE
| | | | * | | | am cd6e6034: (-s ours) am d0d54fc1: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-270-0/+0
| | | | |\ \ \ \ | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cd6e60343a70ecf870f1ac3dcfa1e7981de8773d': Import translations. DO NOT MERGE
| | | | | * | | am d0d54fc1: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-270-0/+0
| | | | | |\ \ \ | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd0d54fc1c54a046eaf919978d584fa3528c36e24': Import translations. DO NOT MERGE
| | | | | | * | Import translations. DO NOT MERGEBaligh Uddin2015-09-2574-8559/+12774
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I371ee96d5324ad70e4143c5e811c7452dc3e1c1f Auto-generated-cl: translation import
* | | | | | | | am 75c4aa21: (-s ours) am e50e0b49: (-s ours) am ec981982: (-s ours) am ↵Baligh Uddin2015-09-270-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9b9d77f1: (-s ours) am 15243a26: (-s ours) Import translations. DO NOT MERGE * commit '75c4aa21246656a8f96f1c26a3cce763a7e17a7b': Import translations. DO NOT MERGE
| * | | | | | | am e50e0b49: (-s ours) am ec981982: (-s ours) am 9b9d77f1: (-s ours) am ↵Baligh Uddin2015-09-270-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 15243a26: (-s ours) Import translations. DO NOT MERGE * commit 'e50e0b49b51f4db840bd900c50df17bcb30664a4': Import translations. DO NOT MERGE
| | * | | | | | am ec981982: (-s ours) am 9b9d77f1: (-s ours) am 15243a26: (-s ours) Import ↵Baligh Uddin2015-09-270-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit 'ec9819828df47813168d99fd2905b98a230a5d6f': Import translations. DO NOT MERGE
| | | * | | | | am 9b9d77f1: (-s ours) am 15243a26: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-270-0/+0
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '9b9d77f163b65057540b37ac4f6732f01f2b2e40': Import translations. DO NOT MERGE
| | | | * | | | am 15243a26: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-270-0/+0
| | | | |\ \ \ \ | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '15243a260c8accf0a1fc999282a10d1ecec334b6': Import translations. DO NOT MERGE
| | | | | * | | Import translations. DO NOT MERGEBaligh Uddin2015-09-2574-7878/+12295
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icdfa968f3734bb4b5cfd7ae32918de6949159f8d Auto-generated-cl: translation import
* | | | | | | | am 586c0605: (-s ours) am 08516de0: (-s ours) am ad7342ec: (-s ours) Import ↵Baligh Uddin2015-09-270-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '586c0605d888e7b5d4bd32120784866f2e9fe67a': Import translations. DO NOT MERGE
| * | | | | | | am 08516de0: (-s ours) am ad7342ec: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-270-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '08516de0fe70780281bc817249fa6dce09b71889': Import translations. DO NOT MERGE
| | * | | | | | am ad7342ec: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-270-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ad7342ec09fb5a6fb28e84d0d93603f8d40ff225': Import translations. DO NOT MERGE
| | | * | | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-2574-7409/+9165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7678603b3f13a9cb9c95006d37c68689d6d9a509 Auto-generated-cl: translation import
* | | | | | | | am 6edd7628: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-260-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '6edd7628fa4786c09c35222b490fae29fafd4181': Import translations. DO NOT MERGE
| * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-254-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iab766ad3ea1ff44ff2c30a8f9e6c95a03bebea62 Auto-generated-cl: translation import
* | | | | | | | am 8151c82b: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-devBaligh Uddin2015-09-250-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '8151c82b5354f8526aa2856100df819cd3230472': Import translations. DO NOT MERGE
| * | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-devBaligh Uddin2015-09-2580-106/+184
| |\ \ \ \ \ \ \
| | * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-2480-106/+184
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8dbabeae97d242d546a379cdd2cea75fceb8bec9 Auto-generated-cl: translation import
* | | | | | | | | am 655ddae8: [Fingerprint] Fix link accessibilityMaurice Lam2015-09-254-3/+944
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '655ddae8b52191633f0052617feb511b0bc02945': [Fingerprint] Fix link accessibility
| * | | | | | | | [Fingerprint] Fix link accessibilityMaurice Lam2015-09-244-3/+944
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copied ExploreByTouchHelper, LinkAccessibilityHelper and LinkTextView from setup wizard and switched fingerprint_settings_footer to use LinkTextView, so that users can navigate to the link in TalkBack mode. Bug: 24343933 Change-Id: I0ff0c054510dfef4263ea223cb0044a4bddf321f
* | | | | | | | am 16a8e8d1: Make picture color mode less of a featureJason Monk2015-09-236-74/+44
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '16a8e8d1028c09abe8b083acf9da70e6d65ebb79': Make picture color mode less of a feature
| * | | | | | | Make picture color mode less of a featureJason Monk2015-09-236-74/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Shun it to developer settings - Hide 'natural' mode - Remove dialog Bug: 24038268 Change-Id: Ibaf363bc06b444f2a361707b98742328fc290cfc
* | | | | | | | am 3d7c4d57: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-230-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '3d7c4d57c4bccb63e156ca5aa0fd01732bdc05ac': Import translations. DO NOT MERGE
| * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-2281-215/+1229
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If9f89fbb505335fd3ab6a87a15fce090005f1e80 Auto-generated-cl: translation import
* | | | | | | | am c5fa6e26: Add a dummy string to help to add "fingerprint" to searchJim Miller2015-09-231-0/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c5fa6e26dffd43d8fab12117d7994d8ab6466048': Add a dummy string to help to add "fingerprint" to search
| * | | | | | | Add a dummy string to help to add "fingerprint" to searchJim Miller2015-09-221-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 24172006 Change-Id: If4f3d9528aa6ac7daabc50ff247f6f542d4fd88c
* | | | | | | | am 7709f92d: Merge "Fix MMS delivery issue by permitting HTTP from Settings ↵Alex Klyubin2015-09-221-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | app." into mnc-dr-dev * commit '7709f92dc0759f1c383f16ccef6bb0e408c0f085': Fix MMS delivery issue by permitting HTTP from Settings app.
| * | | | | | | Merge "Fix MMS delivery issue by permitting HTTP from Settings app." into ↵Alex Klyubin2015-09-221-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev
| | * | | | | | | Fix MMS delivery issue by permitting HTTP from Settings app.Alex Klyubin2015-09-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MMS delivery may fail on carriers which use cleartext HTTP for MMS, due to an issue introduced in Android M. The cause is that the platform-provided HTTP stack refuses cleartext HTTP from the MMS service process because other packages (Settings app, TelephonyProvider) loaded into the com.android.phone process declare a policy that cleartext network traffic is not permitted. The issue might be non-deterministic because the policy depends on the order in which packages are loaded into the process. From the perspective of platform-provided HTTP stacks, whether cleartext HTTP traffic is permitted is a per-process setting. It is set by the framework based on the policy of the package due to which the process is started. Further packages loaded into the process do not affect the per-process policy. This means all packages which may be loaded into the same process must use the same cleartext network traffic policy. This fix relaxes the network security policy of the Settings app to permit cleartext network traffic, so that all packages loaded into the com.android.phone process uses the same policy. Bug: 24222050 Change-Id: Id6d0018b30782c349963d92799d74266e5001729
* | | | | | | | | am 61b8955c: am 8fef0576: am 7b2994d2: (-s ours) am 1304f47c: am 5cac8966: ↵Zach Jang2015-09-210-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 8fc9b5b6: am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 * commit '61b8955c86a9c949888949be91c06fadf04890cb': DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
| * | | | | | | | am 8fef0576: am 7b2994d2: (-s ours) am 1304f47c: am 5cac8966: am 8fc9b5b6: ↵Zach Jang2015-09-210-0/+0
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 * commit '8fef0576518fa9baaf701e1da5564c2f6f2d9645': DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
| | * | | | | | | am 7b2994d2: (-s ours) am 1304f47c: am 5cac8966: am 8fc9b5b6: am 2e006b2b: ↵Zach Jang2015-09-210-0/+0
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 * commit '7b2994d2e87eafe84425666aba8f818e661a6fac': DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
| | | * | | | | | am 1304f47c: am 5cac8966: am 8fc9b5b6: am 2e006b2b: am b7e865ee: (-s ours) ↵Zach Jang2015-09-210-0/+0
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 * commit '1304f47c1b63d1daa001f4d1c209a34f1b3af5d3': DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
| | | | * | | | | am 5cac8966: am 8fc9b5b6: am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: ↵Zach Jang2015-09-210-0/+0
| | | | |\ \ \ \ \ | | | | | | |/ / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 * commit '5cac896612ead73d08acb588e2f62512f8789cf4': DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
| | | | | * | | | am 8fc9b5b6: am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: ↵Zach Jang2015-09-210-0/+0
| | | | | |\ \ \ \ | | | | | | | |/ / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 * commit '8fc9b5b68494ac341b882623b1cbe124fd6256f8': DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
| | | | | | * | | am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - ↵Zach Jang2015-09-170-0/+0
| | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of ag/748147 - Security Patch Level in Settings CL#3/3 * commit '2e006b2b07c7c333c51fb9b447b8df6df66ba421': DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
| | | | | | | * \ \ am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ↵Zach Jang2015-09-170-0/+0
| | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ag/748147 - Security Patch Level in Settings CL#3/3 * commit 'b7e865ee486ea255e0f76c4d0129d608a7e7995d': DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
| | | | | | | | * \ \ am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security ↵Zach Jang2015-09-173-0/+16
| | | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch Level in Settings CL#3/3 * commit '0431bc18b85c410d14bbfd0dbcc87d54edbb1507': DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
| | | | | | | | | * \ \ am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in ↵Zach Jang2015-09-173-0/+16
| | | | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Settings CL#3/3 * commit 'e7e0c03f003930461603ae71ec0ce815d5a7f40a': DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
| | | | | | | | | | * | | DO NOT MERGE - Backport of ag/748147 - Security Patch Level in SettingsZach Jang2015-09-123-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CL#3/3 b/23946860 Change-Id: Idd318380829f20616d4f1691965b55bfff3afbe0
* | | | | | | | | | | | | am 825518b7: am 2ead0934: am 386c7763: (-s ours) am 564ec935: am 00721b4a: ↵Zach Jang2015-09-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 * commit '825518b7b996d5d8df84f801b3d1725e786f132f': DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
| * | | | | | | | | | | | am 2ead0934: am 386c7763: (-s ours) am 564ec935: am 00721b4a: am c87ceb7e: ↵Zach Jang2015-09-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 * commit '2ead093496c3b5b266c21a483c4f0c37869d57de': DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
| | * | | | | | | | | | am 386c7763: (-s ours) am 564ec935: am 00721b4a: am c87ceb7e: am 6ceb2ba9: ↵Zach Jang2015-09-210-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 * commit '386c7763eb8cd3e856a26fe3cbd39cc573978c29': DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
| | | * | | | | | | | | am 564ec935: am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport ↵Zach Jang2015-09-213-0/+16
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of ag/748147 - Security Patch Level in Settings CL#3/3 * commit '564ec9357bac62d571ba8ba9d58957477b8b5209': DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
| | | | * | | | | | | | am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 ↵Zach Jang2015-09-213-0/+16
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Security Patch Level in Settings CL#3/3 * commit '00721b4afa3940138e82cd150bb6670239ec0b5b': DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
| | | | | * | | | | | | am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security ↵Zach Jang2015-09-213-0/+16
| | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch Level in Settings CL#3/3 * commit 'c87ceb7ec1a57857ebf169a7d2e1dc05fc9521ec': DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
| | | | | | * | | | | | am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in ↵Zach Jang2015-09-173-0/+16
| | | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Settings CL#3/3 * commit '6ceb2ba9b8928b33c30e0c639539c3fe2f27971e': DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
| | | | | | | * | | | | DO NOT MERGE - Backport of ag/748147 - Security Patch Level in SettingsZach Jang2015-09-143-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CL#3/3 b/23946860 Change-Id: I2cfcfcbc28d6a1391cae55f505a2b981df9ade2c
* | | | | | | | | | | | am 2d0db309: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-devBaligh Uddin2015-09-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2d0db3098ebdbe20a0cbe4a8afc7b8e593317d3b': Import translations. DO NOT MERGE
generated by cgit v1.1 at 2025-02-06 03:31:48 +0000