aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Import translations. DO NOT MERGE" into nyc-devBaligh Uddin2016-05-220-0/+0
|\ | | | | | | | | | | | | | | | | am: ada5c5f12f -s ours * commit 'ada5c5f12f3947742aa6d7c2f38152237b5e5dad': Import translations. DO NOT MERGE Change-Id: I9609562c492fab4b05ce08b732ca56fd6e1b145d
| * Merge "Import translations. DO NOT MERGE" into nyc-devBaligh Uddin2016-05-221-1/+1
| |\
| | * Import translations. DO NOT MERGEBaligh Uddin2016-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 28857042 Change-Id: I890ed5b89543a76647530e9ffc80f98e20020bc3
* | | Merge "Import translations. DO NOT MERGE" into nyc-devBaligh Uddin2016-05-220-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | am: c27bf8ea68 -s ours * commit 'c27bf8ea680f3319a44a1b9c2dda480d7836c575': Import translations. DO NOT MERGE Change-Id: Ic6d9770d7559def0847bf5bc4f1a803c40a6219b
| * | Merge "Import translations. DO NOT MERGE" into nyc-devBaligh Uddin2016-05-225-8/+8
| |\ \
| | * | Import translations. DO NOT MERGEBaligh Uddin2016-05-215-8/+8
| | |/ | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 28857042 Change-Id: I877e6a439e4c965adb2b71a9ffb3469713abb305
* | | Merge "Import translations. DO NOT MERGE" into nyc-devBaligh Uddin2016-05-220-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | am: b731377822 -s ours * commit 'b731377822c212b7742cdf61fac918a30f12a1b4': Import translations. DO NOT MERGE Change-Id: I293ec249d6183e977d0c3aa2d11b6e41812f9252
| * | Merge "Import translations. DO NOT MERGE" into nyc-devBaligh Uddin2016-05-223-5/+5
| |\ \
| | * | Import translations. DO NOT MERGEBaligh Uddin2016-05-213-5/+5
| | |/ | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 28857042 Change-Id: Ia2181faa9ac4471facc88dfa9d00b9210b6fa3a6
* | | Import translations. DO NOT MERGEBaligh Uddin2016-05-220-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | am: 491c2654b7 -s ours * commit '491c2654b7220a4fa93c8ee3ca349d8a0e05234a': Import translations. DO NOT MERGE Change-Id: I95a3d0da86f579e596f890f61ff3374f08c08fbf
| * | Import translations. DO NOT MERGEBaligh Uddin2016-05-2136-134/+134
| |/ | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 28857042 Change-Id: I1c097fdfd4d1e8b9a532a8b991acc7ddea731389
* | 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
* | 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 "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 "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 "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 "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 "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 "Import translations. DO NOT MERGE" into nyc-devBaligh Uddin2016-05-044-6/+6
| |\ \
| | * | Import translations. DO NOT MERGEBaligh Uddin2016-05-034-6/+6
| | |/ | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 28463229 Change-Id: I4d269572319b49c8e9dc336f05d18309419ea812
* | | Merge "Import translations. DO NOT MERGE" into nyc-devBaligh Uddin2016-05-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | am: 0705a5136e -s ours * commit '0705a5136ede23cee4c1a9e16ebe98edf9525930': Import translations. DO NOT MERGE Change-Id: I0264b7c49fbcd502315e6bce658e103f7ffb36d3
| * | Merge "Import translations. DO NOT MERGE" into nyc-devBaligh Uddin2016-05-042-0/+48
| |\ \
| | * | Import translations. DO NOT MERGEBaligh Uddin2016-05-032-0/+48
| | |/ | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 28463229 Change-Id: I0f5b249a5bdacdac2c25d7f2749788cbdfec39fe
* | | Merge "Import translations. DO NOT MERGE" into nyc-devBaligh Uddin2016-05-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | am: 9058fc71c2 -s ours * commit '9058fc71c292823f746b514d91b0dfdad8b20893': Import translations. DO NOT MERGE Change-Id: I40dee41684b31c22023e0034b5cf1f3f6fd5a0eb
| * | Merge "Import translations. DO NOT MERGE" into nyc-devBaligh Uddin2016-05-041-0/+27
| |\ \
| | * | Import translations. DO NOT MERGEBaligh Uddin2016-05-031-0/+27
| | |/ | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 28463229 Change-Id: Ia9394c3e4b04ceefbcf12503c69df00fafc62495
* | | Import translations. DO NOT MERGEBaligh Uddin2016-05-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | am: 610e87310e -s ours * commit '610e87310eb1c054a0a7561a733e33b2c7773330': Import translations. DO NOT MERGE Change-Id: Ib4feb4b5978810333f51ca122861ded4ef554c58
| * | Import translations. DO NOT MERGEBaligh Uddin2016-05-032-11/+46
| |/ | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 28463229 Change-Id: If5df56492630f8708bbbccb875856f9635206f78
* | Import translations. DO NOT MERGEBill Yi2016-04-040-0/+0
|\| | | | | | | | | | | | | | | | | am: 33da550 -s ours * commit '33da5501b91ef63d008446047ec59ec0bcd74d18': Import translations. DO NOT MERGE Change-Id: I163849806633e7986e1de19367ead498c0a4e249
| * Import translations. DO NOT MERGEBill Yi2016-04-042-5/+5
| | | | | | | | | | Change-Id: Icc1edaa3ec28e11ed6520e3363d6b210fe7ee335 Auto-generated-cl: translation import
* | Merge "Stop mixing and matching platform and NDK."Dan Albert2016-03-241-3/+3
|\ \ | | | | | | | | | | | | | | | | | | am: b0d902f * commit 'b0d902f2e4f90ee4fd0eda46fa16133bdd2d09d8': Stop mixing and matching platform and NDK.
| * \ Merge "Stop mixing and matching platform and NDK."Dan Albert2016-03-241-3/+3
| |\ \
| | * | Stop mixing and matching platform and NDK.Dan Albert2016-03-221-3/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | The library was being built with the NDK, but the test is being built with the platform, in this case building against the NDK STL headers and then using the platform library, which are not ABI compatible. Bug: http://b/27801981 Change-Id: I7386dfe6ac73334d7c1b1e0cbc8dc346c84313bf
* | | Merge "Import translations. DO NOT MERGE" into nyc-devGeoff Mendal2016-03-190-0/+0
|\ \ \ | | |/ | |/| | | | | | | | | | | | | am: aa89882 -s ours * commit 'aa89882508f514cca4972f4b4011324c5949049e': Import translations. DO NOT MERGE
| * | Merge "Import translations. DO NOT MERGE" into nyc-devGeoff Mendal2016-03-1979-234/+748
| |\ \
| | * | Import translations. DO NOT MERGEGeoff Mendal2016-03-1879-234/+748
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie8dddc467e695a05206fcbc8e0ec6cbcb66108ee Auto-generated-cl: translation import
* | | | Merge "Import translations. DO NOT MERGE" into nyc-devGeoff Mendal2016-03-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4024459 -s ours * commit '4024459f0dead33dee901e0d6b6b53fd6e16164f': Import translations. DO NOT MERGE
| * | | Merge "Import translations. DO NOT MERGE" into nyc-devGeoff Mendal2016-03-192-2/+2
| |\ \ \
| | * | | Import translations. DO NOT MERGEGeoff Mendal2016-03-182-2/+2
| | |/ / | | | | | | | | | | | | | | | | Change-Id: I16a6b97b27126824e7a2f58c82af51485cfa1171 Auto-generated-cl: translation import
* | | | Merge "Import translations. DO NOT MERGE" into nyc-devGeoff Mendal2016-03-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: c8395b8 -s ours * commit 'c8395b88018a2d18e7cd0b46888600626493d3c8': Import translations. DO NOT MERGE
| * | | Merge "Import translations. DO NOT MERGE" into nyc-devGeoff Mendal2016-03-192-2/+2
| |\ \ \
| | * | | Import translations. DO NOT MERGEGeoff Mendal2016-03-182-2/+2
| | |/ / | | | | | | | | | | | | | | | | Change-Id: I412e1b013c24b9e4464fb7800630a300388e1ad8 Auto-generated-cl: translation import
* | | | Import translations. DO NOT MERGEGeoff Mendal2016-03-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 36ef606 -s ours * commit '36ef6068fd1e91635a7d515d752595c9f37cd5da': Import translations. DO NOT MERGE
| * | | Import translations. DO NOT MERGEGeoff Mendal2016-03-181-0/+27
| |/ / | | | | | | | | | | | | Change-Id: I0ec016baae37e091b250af7cd9a1ff1d9df3ef73 Auto-generated-cl: translation import
* | | Follow framework refactoring.Jeff Sharkey2016-03-171-2/+2
|\| | | | | | | | | | | | | | | | | | | | am: a9298f8 * commit 'a9298f88442aae49a0817513209230e3e6e8d4e0': Follow framework refactoring.