aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2016-05-183-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2016-05-163-3/+3
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I55f9de7080aee44da9d7dfb5c3808aa26d1efa5a Auto-generated-cl: translation import
* | | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2016-05-1820-59/+59
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2016-05-1620-59/+59
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4ebae8f4d0547bfd4464139ec8dd7f72ec7eaf5a Auto-generated-cl: translation import
* | | | | | | | | | Follow class package change: LocaleList am: 156139edd8 am: 9e80728fc1Yohei Yukawa2016-05-180-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c7c7baf0a2 * commit 'c7c7baf0a2d583d1443418742ce7e3c21aabba3f': Change-Id: Ic46c2fe4680ec4afa086873bcaa48039be030a5e
| * | | | | | | | | Follow class package change: LocaleList am: 156139edd8Yohei Yukawa2016-05-180-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9e80728fc1 * commit '9e80728fc1e20f6ca2c0d07b911a7939ff1e27c7': Change-Id: Ib396acf6956628b6c862d738717e1fce859e038a
| | * | | | | | | | Follow class package change: LocaleListYohei Yukawa2016-05-181-1/+1
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 156139edd8 * commit '156139edd8f2f845e70861a962aba684aa6e9c3c': Follow class package change: LocaleList Change-Id: I641d1e4a32f78a9599267c70279971c816a366b1
* | | | | | | | | | Follow class package change: LocaleList am: 156139edd8 am: 03a540cc3aYohei Yukawa2016-05-181-1/+1
|\| | | | | | | | | | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 947cc7d7cd * commit '947cc7d7cd32417c016ef474889ed93114395c4e': Follow class package change: LocaleList Change-Id: I7e665d609267182bcfcf11e3fb309dbe9d02c830
| * | | | | | | | Follow class package change: LocaleList am: 156139edd8Yohei Yukawa2016-05-181-1/+1
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 03a540cc3a * commit '03a540cc3a26e73a3fd8ad7075a08fd8439890b6': Follow class package change: LocaleList Change-Id: I82d0024acaea6ae445393bac1e89d757b4ea33c1
| | * | | | | | | Follow class package change: LocaleListYohei Yukawa2016-05-181-1/+1
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 156139edd8 * commit '156139edd8f2f845e70861a962aba684aa6e9c3c': Follow class package change: LocaleList Change-Id: Icfa28b71df2b3b7bc0eb3e0d12a6ab418a809e19
| | | * | | | | | Follow class package change: LocaleListYohei Yukawa2016-05-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to avoid layering violation, LocaleList needs to be moved from android.util package to android.os package [1]. This CL follows up that package change. No behavior change is intended. [1]: Ia8de2ee9df3dd0a42b1fe84574439519b680fe18 Bug: 28819696 Change-Id: Ie795c191e299358c7c463693823f309ce61cc985
* | | | | | | | | Calling getClass on a class will return Class.class.Ian Rogers2016-05-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug introduced in 5ac4638f999db4fea8a9e24171dbceb640a10858. Bug found by error prone: Bug: 27723540 Change-Id: I4325f3bc1f1186bd24d4b0074f0c573cc5cb4e31
* | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93f97c07f6 -s ↵Baligh Uddin2016-05-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 5f0e629a64 -s ours am: 1b39859105 -s ours * commit '1b3985910548d8cf99ec2c489b26ce1765c6619d': Change-Id: Id82e0d54e8503f8496070de61ce5ebd3df4cdb7f
| * | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93f97c07f6 -s oursBaligh Uddin2016-05-040-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5f0e629a64 -s ours * commit '5f0e629a64ea2c18f4ca6b2cf3b7dea9496c93bc': Change-Id: Ie06087ea99fb977f5dc0a828a9f5aca0d777a17d
| | * | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-devBaligh Uddin2016-05-040-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 93f97c07f6 -s ours * commit '93f97c07f6a505ec5e81b27745a79deb4be48335': Import translations. DO NOT MERGE Change-Id: Ia45121c428293b9e3a9cdb6117dcc53bf67df50b
* | | | | | | | | Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93f97c07f6 ↵Baligh Uddin2016-05-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: 6ed0a2869f -s ours" into nyc-mr1-dev-plus-aosp am: 2246035952 -s ours * commit '2246035952fcbbdfc6ccc3ed3e14790f4b27761d': Import translations. DO NOT MERGE Change-Id: I71386c54670ddc33e556abfb9f50a853413b270b
| * | | | | | | | Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93f97c07f6 ↵Android Build Merger (Role)2016-05-040-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: 6ed0a2869f -s ours" into nyc-mr1-dev-plus-aosp
| | * \ \ \ \ \ \ \ Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93f97c07f6 -s oursBaligh Uddin2016-05-040-0/+0
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6ed0a2869f -s ours * commit '6ed0a2869f9fe215099d8a005082a754772c5727': Import translations. DO NOT MERGE Change-Id: Iec9405a2c6a1a7e600417733c245518ef67bd107
| | | * | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-devBaligh Uddin2016-05-040-0/+0
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 93f97c07f6 -s ours * commit '93f97c07f6a505ec5e81b27745a79deb4be48335': Import translations. DO NOT MERGE Change-Id: I06c9792f8b4117802d1999149cbe153c43b88a63
| | | | * | | | | | Merge "Import translations. DO NOT MERGE" into nyc-devBaligh Uddin2016-05-0480-1247/+846
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Import translations. DO NOT MERGEBaligh Uddin2016-05-0380-1247/+846
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 28463229 Change-Id: I312a18663314497174fdadc574e55ef03073cd54
* | | | | | | | | | | Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: a62d335d5b ↵Baligh Uddin2016-05-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: 060ce29db5 -s ours" into nyc-mr1-dev-plus-aosp am: 08bc0752bb -s ours * commit '08bc0752bbdf0b59b76900db64be81ad16c6b20a': Change-Id: I9c98f7d15c15a5abe2b5448cdec9917d67584cc3
| * | | | | | | | | | Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: a62d335d5b ↵Android Build Merger (Role)2016-05-040-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: 060ce29db5 -s ours" into nyc-mr1-dev-plus-aosp
| | * \ \ \ \ \ \ \ \ \ Merge "Import translations. DO NOT MERGE" into nyc-dev am: a62d335d5b -s oursBaligh Uddin2016-05-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 060ce29db5 -s ours * commit '060ce29db54eb4ec5f8757b0ea3681f77c0b0a9f': Import translations. DO NOT MERGE Change-Id: I02a4a5ff2512b5a64e7c8bb8d9b7443699a94464
| | | * | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-devBaligh Uddin2016-05-040-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a62d335d5b -s ours * commit 'a62d335d5b5b06d11b2e433ec628fa37d2bc1536': Import translations. DO NOT MERGE Change-Id: I4f4a04b69aed737d89eb5016a77d3a7613c26dc6
* | | | | | | | | | | | Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: a62d335d5b ↵Baligh Uddin2016-05-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: 5a10418bf0 -s ours" into nyc-mr1-dev-plus-aosp am: 519f4dfc7b -s ours * commit '519f4dfc7b42079c8b2e2d748c3445665252aa82': Import translations. DO NOT MERGE Change-Id: If46d8fc8d5bb6e583e31bba93a383f3d037e4963
| * | | | | | | | | | | Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: a62d335d5b ↵Android Build Merger (Role)2016-05-040-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | -s ours am: 5a10418bf0 -s ours" into nyc-mr1-dev-plus-aosp
| | * | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: a62d335d5b -s oursBaligh Uddin2016-05-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5a10418bf0 -s ours * commit '5a10418bf0ad7d1e0f21f3096a9ac16bb7cbddd5': Import translations. DO NOT MERGE Change-Id: I2f3a246a58d927755004791af59c56404ff890b2
| | | * | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-devBaligh Uddin2016-05-040-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a62d335d5b -s ours * commit 'a62d335d5b5b06d11b2e433ec628fa37d2bc1536': Import translations. DO NOT MERGE Change-Id: Ic5079d93aaebfda3cf9af9ba55ffd7a8e3958f1f
| | | | * | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-devBaligh Uddin2016-05-042-0/+224
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2016-05-032-0/+224
| | | | | | |_|/ / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 28463229 Change-Id: I0ece40ba9d78c92dab06f2b9861dee7ef221081c
* | | | | | | | | | | | Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 1c25c67a6a ↵Baligh Uddin2016-05-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: 919ba24275 -s ours" into nyc-mr1-dev-plus-aosp am: 424e13df65 -s ours * commit '424e13df65d80e4883a96298a46891ee2a8ecd80': Change-Id: I3ef01a3890e8912920ee46dbc840d000ea4d976f
| * | | | | | | | | | | Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 1c25c67a6a ↵Android Build Merger (Role)2016-05-040-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: 919ba24275 -s ours" into nyc-mr1-dev-plus-aosp
| | * | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: 1c25c67a6a -s oursBaligh Uddin2016-05-040-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 919ba24275 -s ours * commit '919ba242758481c88d5372b909f95ed7883ee0b8': Import translations. DO NOT MERGE Change-Id: I4f0110655c2d73b30539dc4a1ff58f07c864bfeb
| | | * | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-devBaligh Uddin2016-05-040-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 1c25c67a6a -s ours * commit '1c25c67a6a553f7cfbd60bb31c1d96441a58af9e': Import translations. DO NOT MERGE Change-Id: Ia6cb2d3ed564f0083f20e01001c27a6fa9d6e768
* | | | | | | | | | | | Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 1c25c67a6a ↵Baligh Uddin2016-05-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: 4e2559c62a -s ours" into nyc-mr1-dev-plus-aosp am: e88320a9c7 -s ours * commit 'e88320a9c709ac27a489c6aced70cb4be971d033': Import translations. DO NOT MERGE Change-Id: I90e930779eaa3ff60cb2f5e056b3b131467f14ff
| * | | | | | | | | | | Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 1c25c67a6a ↵Android Build Merger (Role)2016-05-040-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | -s ours am: 4e2559c62a -s ours" into nyc-mr1-dev-plus-aosp
| | * | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: 1c25c67a6a -s oursBaligh Uddin2016-05-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4e2559c62a -s ours * commit '4e2559c62acedeacfb38c7801224eae9d6ad9571': Import translations. DO NOT MERGE Change-Id: If2d25359f843da654d3d13a4c3009351c2d866f4
| | | * | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-devBaligh Uddin2016-05-040-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 1c25c67a6a -s ours * commit '1c25c67a6a553f7cfbd60bb31c1d96441a58af9e': Import translations. DO NOT MERGE Change-Id: I54b7bcdc4115062b5ac3d5fc58c21208b168de9a
| | | | * | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-devBaligh Uddin2016-05-041-1/+1
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2016-05-031-1/+1
| | | | | | |_|/ / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 28463229 Change-Id: I80bbe7ca3bf53da96b2dc52907b8ca7950281a56
* | | | | | | | | | | | Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 732a35eb23 ↵Baligh Uddin2016-05-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: 1ba6831726 -s ours" into nyc-mr1-dev-plus-aosp am: 53da4dd94a -s ours * commit '53da4dd94a50d6ff6cb37b007bcdf45b700ef114': Change-Id: I39b4ac0e34d21d20953e7e25486c6ed62e5ae69a
| * | | | | | | | | | | Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 732a35eb23 ↵Android Build Merger (Role)2016-05-040-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: 1ba6831726 -s ours" into nyc-mr1-dev-plus-aosp
| | * | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: 732a35eb23 -s oursBaligh Uddin2016-05-040-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 1ba6831726 -s ours * commit '1ba6831726f2f72019a0bca2f44d9e8be7575e09': Import translations. DO NOT MERGE Change-Id: I02ae6d45f9ce9532212a27000d1d1bd983a758ae
| | | * | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-devBaligh Uddin2016-05-040-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 732a35eb23 -s ours * commit '732a35eb238a1343383aba15febba6adf6cefcc5': Import translations. DO NOT MERGE Change-Id: I9bdf3df8b079c2cab4938d05f66f45d73c637e4a
* | | | | | | | | | | | Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 732a35eb23 ↵Baligh Uddin2016-05-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am: f107987432 -s ours" into nyc-mr1-dev-plus-aosp am: bb346a929f -s ours * commit 'bb346a929f801786292c3b365d3bb00e6b653d46': Import translations. DO NOT MERGE Change-Id: I8729a050dcdd7fd99ecc290a86903067e303da75
| * | | | | | | | | | | Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 732a35eb23 ↵Android Build Merger (Role)2016-05-040-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | -s ours am: f107987432 -s ours" into nyc-mr1-dev-plus-aosp
| | * | | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-dev am: 732a35eb23 -s oursBaligh Uddin2016-05-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f107987432 -s ours * commit 'f107987432e209b4abf3381bca92157eb6b41a67': Import translations. DO NOT MERGE Change-Id: I5addd9b87c64877928510b2f58ea06a78625cc62
| | | * | | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-devBaligh Uddin2016-05-040-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 732a35eb23 -s ours * commit '732a35eb238a1343383aba15febba6adf6cefcc5': Import translations. DO NOT MERGE Change-Id: I22c561fa33a0966047de7cb32b6e617eb881f0b1
| | | | * | | | | | | | Merge "Import translations. DO NOT MERGE" into nyc-devBaligh Uddin2016-05-044-6/+6
| | | | |\ \ \ \ \ \ \ \