summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Import translations. DO NOT MERGEGeoff Mendal2015-01-201-1/+1
| | | | | | | | | | | | | | | Change-Id: I41a7c9df7b0a3da52fdb8b695bfca993ed1242a2 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2015-01-051-1/+1
| | | | | | | | | | | | | | | Change-Id: I4563542ca41c5554d1b2b7f0139da1cecda20f0b Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBaligh Uddin2014-12-221-1/+1
| | | | | | | | | | | | | | | Change-Id: I98c36a745527a5e4c4324cb262ba9e4a5256528e Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2014-12-171-1/+1
| | | | | | | | | | | | | | | Change-Id: Ic9b16027a186675d65ac015c60b7275940d468d5 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2014-12-081-1/+1
| | | | | | | | | | | | | | | Change-Id: I8990050edbae501d86a49ac0c7a47b236c8b7f99 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2014-11-241-1/+1
| | | | | | | | | | | | | | | Change-Id: I538e5b37fed489349271f44e556ebce9cfbd2fa6 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEGeoff Mendal2014-11-171-1/+1
| | | | | | | | | | | | | | | Change-Id: I94b37c178962291af02dcd8e3f72fd56e92bbfdb Auto-generated-cl: translation import
* | | am 2d1fc8a1: am 1493cd63: am 137cd8d8: Call local finish(String) on cancelKenny Root2014-11-150-0/+0
|\| | | | | | | | | | | | | | * commit '2d1fc8a1a39d4f384bddf141b9d18b9876dc4e94': Call local finish(String) on cancel
| * | am 1493cd63: am 137cd8d8: Call local finish(String) on cancelKenny Root2014-11-150-0/+0
| |\| | | | | | | | | | | | | * commit '1493cd63e501450cd15103baecc0837ef1778e23': Call local finish(String) on cancel
| | * am 137cd8d8: Call local finish(String) on cancelKenny Root2014-11-141-1/+1
| | |\ | | | | | | | | | | | | | | | | * commit '137cd8d87d62a612a33cae0d8e2b8c440dccaee0': Call local finish(String) on cancel
| | | * Call local finish(String) on cancelKenny Root2014-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change I439592b2236261fa683484cd5c3ba26795aece47 to honor "Cancel" button presses caused a call directly into finish() instead of the local finish(String) which does some extra administrivia. (cherry picked from commit 13e867cb8d4f45f4a7c7a1552d89dfc5ec95f159) Bug: 18381187 Bug: https://code.google.com/p/android/issues/detail?id=79208 Change-Id: Ica7f52ce3afa82d95ea5cc3cb15c9ac7b734cf93
* | | | am 6ee8c8a8: am dfeaab74: Merge "Call local finish(String) on cancel"Kenny Root2014-11-141-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit '6ee8c8a8cb2391241985b9c61a86271f00a3d9ce': Call local finish(String) on cancel
| * | | am dfeaab74: Merge "Call local finish(String) on cancel"Kenny Root2014-11-141-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'dfeaab7419362fd0dd0aaaa1b123323947f7be36': Call local finish(String) on cancel
| | * \ \ Merge "Call local finish(String) on cancel"Kenny Root2014-11-141-1/+1
| | |\ \ \
| | | * | | Call local finish(String) on cancelKenny Root2014-11-141-1/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change I439592b2236261fa683484cd5c3ba26795aece47 to honor "Cancel" button presses caused a call directly into finish() instead of the local finish(String) which does some extra administrivia. Bug: 18381187 Bug: https://code.google.com/p/android/issues/detail?id=79208 Change-Id: Ica7f52ce3afa82d95ea5cc3cb15c9ac7b734cf93
* | | | | Import translations. DO NOT MERGEGeoff Mendal2014-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3c696fdb0545099c58a8ecf0b472f080fcce9124 Auto-generated-cl: translation import
* | | | | Import translations. DO NOT MERGEGeoff Mendal2014-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I18e64568d05efaa1c2719f2d914f9cba6d720528 Auto-generated-cl: translation import
* | | | | Import translations. DO NOT MERGEBaligh Uddin2014-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id58cefd7ba342537ef1dca3e3b9101aae72f7cdc Auto-generated-cl: translation import
* | | | | am a4367714: (-s ours) am 8127df96: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-310-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'a43677145544d5908e393b959e02f4d4ea070b44': Import translations. DO NOT MERGE
| * | | | am 8127df96: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-310-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '8127df96f5fd50cc216b74d51a7ab87397b02891': Import translations. DO NOT MERGE
| | * | | Import translations. DO NOT MERGEBaligh Uddin2014-10-303-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I549c7ff0e9ab11ce4d268ace60b6d54f287aaf57 Auto-generated-cl: translation import
* | | | | am 16c6d1fc: (-s ours) am fcbe9bb2: (-s ours) am 0b1acbb5: (-s ours) Import ↵Baligh Uddin2014-10-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '16c6d1fcdc2a0df5c3baee6a6942945c9cbe1f36':
| * | | | am fcbe9bb2: (-s ours) am 0b1acbb5: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-270-0/+0
| |\| | | | | | | | | | | | | | | | | | * commit 'fcbe9bb22aab07a130e0d74084c464827d6aa5ef':
| | * | | am 0b1acbb5: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-09-290-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '0b1acbb5bf0301eb2299a20a72c64b01b8b2abdf': Import translations. DO NOT MERGE
* | | | | | am ed6a0ca2: (-s ours) am 91baff48: (-s ours) am a2edad16: (-s ours) am ↵Baligh Uddin2014-10-270-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 796e3c3f: (-s ours) Import translations. DO NOT MERGE * commit 'ed6a0ca2f1547a6d1a6a334af1399eaa56c40c1c':
| * | | | | am 91baff48: (-s ours) am a2edad16: (-s ours) am 796e3c3f: (-s ours) Import ↵Baligh Uddin2014-10-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '91baff4826343738eb06229a330d269e8704cc45':
* | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie0223b65c3f8132ab26f0b4d23e69f719d72ddf6 Auto-generated-cl: translation import
* | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia1ce8b14b4de5e2f67a2a4d9293d664075665620 Auto-generated-cl: translation import
* | | | | | am 1cefae9b: am 814d4282: am 1f00eaf6: Only send storage_changed intent to ↵Robin Lee2014-10-171-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | current user * commit '1cefae9ba358610987f3dc8686ef00f5eb85d372': Only send storage_changed intent to current user
| * | | | | am 814d4282: am 1f00eaf6: Only send storage_changed intent to current userRobin Lee2014-10-171-1/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | * commit '814d42826529215994d7ba64dce142ff2261804e': Only send storage_changed intent to current user
| | * | | | am 1f00eaf6: Only send storage_changed intent to current userRobin Lee2014-10-171-1/+1
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | * commit '1f00eaf6936421542f139f1066bd4656af3a8b11': Only send storage_changed intent to current user
| | | * | | Only send storage_changed intent to current userRobin Lee2014-10-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stops the "Calling a method in the system process without a qualified user" warning we get due to KeyChain running under the system's uid. Bug: 18028613 Change-Id: I4d0c61a8423f81cb35b1cf41d96ed235edb9ce65
* | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iccccf07749059267673448ae68071f6f87db9e4d Auto-generated-cl: translation import
* | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I82e9cecfdac06a2caa332104ea8d83bafb37c1da Auto-generated-cl: translation import
* | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4c92610588273de69c563dcc8ad02cd3ff47fd95 Auto-generated-cl: translation import
* | | | | | am ff82cc6d: (-s ours) am 8d1a60d4: (-s ours) am 0b470dd9: (-s ours) am ↵Baligh Uddin2014-09-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8ddabcd0: (-s ours) am 0b1acbb5: (-s ours) Import translations. DO NOT MERGE * commit 'ff82cc6dfc91b128e965e2a998294e2c6b575f33': Import translations. DO NOT MERGE
| * | | | | am 8d1a60d4: (-s ours) am 0b470dd9: (-s ours) am 8ddabcd0: (-s ours) am ↵Baligh Uddin2014-09-300-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b1acbb5: (-s ours) Import translations. DO NOT MERGE * commit '8d1a60d40671e92dd8867b7f51446a75ebf832fc': Import translations. DO NOT MERGE
| | * | | | am 0b470dd9: (-s ours) am 8ddabcd0: (-s ours) am 0b1acbb5: (-s ours) Import ↵Baligh Uddin2014-09-300-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit '0b470dd9758d09d8adefc10a55b2ad3bc8fc022d': Import translations. DO NOT MERGE
| | | * | | am 8ddabcd0: (-s ours) am 0b1acbb5: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-09-300-0/+0
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8ddabcd098ede5cd6c5cef1e3b36e3982c50af03': Import translations. DO NOT MERGE
| | | | * \ \ am 0b1acbb5: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-09-300-0/+0
| | | | |\ \ \ | | | | | | |/ | | | | | |/| | | | | | | | | | | | | | | * commit '0b1acbb5bf0301eb2299a20a72c64b01b8b2abdf': Import translations. DO NOT MERGE
| | | | | * | Import translations. DO NOT MERGEBaligh Uddin2014-09-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9cee323d47b24dec6c906384bb9c2c472d5ed937 Auto-generated-cl: translation import
* | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-09-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I09a1fd5bc87f657f523638ff7298754354f7a7f2 Auto-generated-cl: translation import
* | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-09-192-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-09-162-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I499e1a6ab74ac35b2aa40eebabec38c05ccd8fe6 Auto-generated-cl: translation import
* | | | | | | | am 1955e485: (-s ours) am c86f1a7f: (-s ours) am e2ebab44: (-s ours) am ↵Baligh Uddin2014-09-190-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 53557032: (-s ours) am 796e3c3f: (-s ours) Import translations. DO NOT MERGE * commit '1955e485332e0c0c7ba628a8fee888b55dbb3065':
| * | | | | | | am c86f1a7f: (-s ours) am e2ebab44: (-s ours) am 53557032: (-s ours) am ↵Baligh Uddin2014-09-160-0/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 796e3c3f: (-s ours) Import translations. DO NOT MERGE * commit 'c86f1a7fb3c34a77ea1313fe2d05113a4c7ac16b': Import translations. DO NOT MERGE
| | * | | | | | am e2ebab44: (-s ours) am 53557032: (-s ours) am 796e3c3f: (-s ours) Import ↵Baligh Uddin2014-09-160-0/+0
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit 'e2ebab448a5c4db2a463f20222f238162c0e0c58': Import translations. DO NOT MERGE
| | | * | | | | am 53557032: (-s ours) am 796e3c3f: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-09-160-0/+0
| | |/| | | | | | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | * commit '5355703217af5b63e496b26b4c8257f426fcdd86': Import translations. DO NOT MERGE
| | | * | | | am 796e3c3f: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-09-160-0/+0
| | |/| | | | | | | | |/ / | | | |/| | | | | | | | | | | | | | * commit '796e3c3fd12b9e8675a98d698affc167fd82dae7': Import translations. DO NOT MERGE
* | | | | | am 91baff48: (-s ours) am a2edad16: (-s ours) am 796e3c3f: (-s ours) Import ↵Baligh Uddin2014-09-160-0/+0
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | | | | | | | | | | | | translations. DO NOT MERGE * commit '91baff4826343738eb06229a330d269e8704cc45': Import translations. DO NOT MERGE