Android Build Merger (Role)
0b2f35fb3d
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 0705a5136e
-s ours am: 42d8dccd89
-s ours" into nyc-mr1-dev-plus-aosp
2016-05-04 01:40:24 +00:00
Android Build Merger (Role)
866640f259
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 0705a5136e
-s ours am: f745ac7a08
-s ours" into nyc-mr1-dev-plus-aosp
2016-05-04 01:40:23 +00:00
Android Build Merger (Role)
0559d7f100
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 9058fc71c2
-s ours am: 39265fb6de
-s ours" into nyc-mr1-dev-plus-aosp
2016-05-04 01:40:20 +00:00
Baligh Uddin
d3ebb66753
Merge "Import translations. DO NOT MERGE" into nyc-dev am: a62d335d5b
-s ours
...
am: 060ce29db5
-s ours
* commit '060ce29db54eb4ec5f8757b0ea3681f77c0b0a9f':
Import translations. DO NOT MERGE
Change-Id: I02a4a5ff2512b5a64e7c8bb8d9b7443699a94464
2016-05-04 01:40:02 +00:00
Baligh Uddin
9d466a8a5e
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 1c25c67a6a
-s ours
...
am: 4e2559c62a
-s ours
* commit '4e2559c62acedeacfb38c7801224eae9d6ad9571':
Import translations. DO NOT MERGE
Change-Id: If2d25359f843da654d3d13a4c3009351c2d866f4
2016-05-04 01:40:01 +00:00
Baligh Uddin
46af449705
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 732a35eb23
-s ours
...
am: 1ba6831726
-s ours
* commit '1ba6831726f2f72019a0bca2f44d9e8be7575e09':
Import translations. DO NOT MERGE
Change-Id: I02ae6d45f9ce9532212a27000d1d1bd983a758ae
2016-05-04 01:39:59 +00:00
Baligh Uddin
3f31847a4a
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 0705a5136e
-s ours
...
am: 42d8dccd89
-s ours
* commit '42d8dccd89ca310e943cdab0ae188cdf9da08cb4':
Import translations. DO NOT MERGE
Change-Id: I57045ccd9866bf453cfec08f89a1b7d94c4b561e
2016-05-04 01:39:57 +00:00
Baligh Uddin
33a09d4dbb
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 9058fc71c2
-s ours
...
am: 39265fb6de
-s ours
* commit '39265fb6de0e1d47670da10ece988a802a814f53':
Import translations. DO NOT MERGE
Change-Id: I72e5318f7b661647f166ccaa96582698d54e4e39
2016-05-04 01:39:54 +00:00
Baligh Uddin
ecf0a18209
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93f97c07f6
-s ours
...
am: 6ed0a2869f
-s ours
* commit '6ed0a2869f9fe215099d8a005082a754772c5727':
Import translations. DO NOT MERGE
Change-Id: Iec9405a2c6a1a7e600417733c245518ef67bd107
2016-05-04 01:39:46 +00:00
Baligh Uddin
f3615de6ff
Merge "Import translations. DO NOT MERGE" into nyc-dev am: a62d335d5b
-s ours
...
am: 5a10418bf0
-s ours
* commit '5a10418bf0ad7d1e0f21f3096a9ac16bb7cbddd5':
Import translations. DO NOT MERGE
Change-Id: I2f3a246a58d927755004791af59c56404ff890b2
2016-05-04 01:39:45 +00:00
Baligh Uddin
f8a514dfd6
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 1c25c67a6a
-s ours
...
am: 919ba24275
-s ours
* commit '919ba242758481c88d5372b909f95ed7883ee0b8':
Import translations. DO NOT MERGE
Change-Id: I4f0110655c2d73b30539dc4a1ff58f07c864bfeb
2016-05-04 01:39:44 +00:00
Baligh Uddin
29cf43bfef
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 732a35eb23
-s ours
...
am: f107987432
-s ours
* commit 'f107987432e209b4abf3381bca92157eb6b41a67':
Import translations. DO NOT MERGE
Change-Id: I5addd9b87c64877928510b2f58ea06a78625cc62
2016-05-04 01:39:43 +00:00
Baligh Uddin
113c4838a3
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 0705a5136e
-s ours
...
am: f745ac7a08
-s ours
* commit 'f745ac7a084e278146b2a386baf4e30c8fdfb12e':
Import translations. DO NOT MERGE
Change-Id: I6bb139fcd0dbafcaeab2cf70fb030f63089e41e2
2016-05-04 01:39:41 +00:00
Baligh Uddin
568999a110
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 9058fc71c2
-s ours
...
am: 05d64fec0f
-s ours
* commit '05d64fec0fad91a1b1f77414472aeb355d2bd0cc':
Import translations. DO NOT MERGE
Change-Id: I7be3c41979b23c4c9f1de57596f0b2b0b1bf9da7
2016-05-04 01:39:39 +00:00
Baligh Uddin
5f0e629a64
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 93f97c07f6
-s ours
* commit '93f97c07f6a505ec5e81b27745a79deb4be48335':
Import translations. DO NOT MERGE
Change-Id: Ia45121c428293b9e3a9cdb6117dcc53bf67df50b
2016-05-04 01:37:10 +00:00
Baligh Uddin
060ce29db5
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: a62d335d5b
-s ours
* commit 'a62d335d5b5b06d11b2e433ec628fa37d2bc1536':
Import translations. DO NOT MERGE
Change-Id: I4f4a04b69aed737d89eb5016a77d3a7613c26dc6
2016-05-04 01:37:09 +00:00
Baligh Uddin
4e2559c62a
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 1c25c67a6a
-s ours
* commit '1c25c67a6a553f7cfbd60bb31c1d96441a58af9e':
Import translations. DO NOT MERGE
Change-Id: I54b7bcdc4115062b5ac3d5fc58c21208b168de9a
2016-05-04 01:37:08 +00:00
Baligh Uddin
1ba6831726
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 732a35eb23
-s ours
* commit '732a35eb238a1343383aba15febba6adf6cefcc5':
Import translations. DO NOT MERGE
Change-Id: I9bdf3df8b079c2cab4938d05f66f45d73c637e4a
2016-05-04 01:37:08 +00:00
Baligh Uddin
42d8dccd89
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 0705a5136e
-s ours
* commit '0705a5136ede23cee4c1a9e16ebe98edf9525930':
Import translations. DO NOT MERGE
Change-Id: I0264b7c49fbcd502315e6bce658e103f7ffb36d3
2016-05-04 01:37:07 +00:00
Baligh Uddin
39265fb6de
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 9058fc71c2
-s ours
* commit '9058fc71c292823f746b514d91b0dfdad8b20893':
Import translations. DO NOT MERGE
Change-Id: I40dee41684b31c22023e0034b5cf1f3f6fd5a0eb
2016-05-04 01:37:06 +00:00
Baligh Uddin
6ed0a2869f
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 93f97c07f6
-s ours
* commit '93f97c07f6a505ec5e81b27745a79deb4be48335':
Import translations. DO NOT MERGE
Change-Id: I06c9792f8b4117802d1999149cbe153c43b88a63
2016-05-04 01:36:59 +00:00
Baligh Uddin
5a10418bf0
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: a62d335d5b
-s ours
* commit 'a62d335d5b5b06d11b2e433ec628fa37d2bc1536':
Import translations. DO NOT MERGE
Change-Id: Ic5079d93aaebfda3cf9af9ba55ffd7a8e3958f1f
2016-05-04 01:36:58 +00:00
Baligh Uddin
919ba24275
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 1c25c67a6a
-s ours
* commit '1c25c67a6a553f7cfbd60bb31c1d96441a58af9e':
Import translations. DO NOT MERGE
Change-Id: Ia6cb2d3ed564f0083f20e01001c27a6fa9d6e768
2016-05-04 01:36:57 +00:00
Baligh Uddin
f107987432
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 732a35eb23
-s ours
* commit '732a35eb238a1343383aba15febba6adf6cefcc5':
Import translations. DO NOT MERGE
Change-Id: I22c561fa33a0966047de7cb32b6e617eb881f0b1
2016-05-04 01:36:56 +00:00
Baligh Uddin
f745ac7a08
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 0705a5136e
-s ours
* commit '0705a5136ede23cee4c1a9e16ebe98edf9525930':
Import translations. DO NOT MERGE
Change-Id: Ic5d99acd859ef0f433c762ee161a349a1d7a7815
2016-05-04 01:36:54 +00:00
Baligh Uddin
05d64fec0f
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 9058fc71c2
-s ours
* commit '9058fc71c292823f746b514d91b0dfdad8b20893':
Import translations. DO NOT MERGE
Change-Id: I518ae421e6d9b50fc859b3baff97798dacf3fbc5
2016-05-04 01:36:52 +00:00
Baligh Uddin
93f97c07f6
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-05-04 01:33:32 +00:00
Baligh Uddin
a62d335d5b
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-05-04 01:33:28 +00:00
Baligh Uddin
1c25c67a6a
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-05-04 01:33:24 +00:00
Baligh Uddin
732a35eb23
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-05-04 01:33:20 +00:00
Baligh Uddin
0705a5136e
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-05-04 01:33:15 +00:00
Baligh Uddin
9058fc71c2
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-05-04 01:33:11 +00:00
Baligh Uddin
995713eae7
Import translations. DO NOT MERGE am: 610e87310e
-s ours
...
am: 7944bf983a
-s ours
* commit '7944bf983a1383717fafe1103ae05116d24c28c3':
Change-Id: Ifd8e6c7d08f2f1f9482c54e570ecb12746331627
2016-05-04 00:40:09 +00:00
Baligh Uddin
83fd1f743b
Import translations. DO NOT MERGE am: 610e87310e
-s ours
...
am: 6336bcc62c
-s ours
* commit '6336bcc62cad16241b6fb34e5482c1c9db038f1b':
Import translations. DO NOT MERGE
Change-Id: I53915363c94f8114b6e5aebcb2c5e0860b5b7b06
2016-05-04 00:36:39 +00:00
Baligh Uddin
6336bcc62c
Import translations. DO NOT MERGE
...
am: 610e87310e
-s ours
* commit '610e87310eb1c054a0a7561a733e33b2c7773330':
Import translations. DO NOT MERGE
Change-Id: Ib4feb4b5978810333f51ca122861ded4ef554c58
2016-05-04 00:31:20 +00:00
Baligh Uddin
7944bf983a
Import translations. DO NOT MERGE
...
am: 610e87310e
-s ours
* commit '610e87310eb1c054a0a7561a733e33b2c7773330':
Import translations. DO NOT MERGE
Change-Id: I2e0a79f3c87cac153fdbb79c455b87400840cf15
2016-05-04 00:31:15 +00:00
Baligh Uddin
e577ec06f8
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 28463229
Change-Id: I312a18663314497174fdadc574e55ef03073cd54
2016-05-03 17:24:26 -07:00
Baligh Uddin
24fb9d93ee
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 28463229
Change-Id: I0ece40ba9d78c92dab06f2b9861dee7ef221081c
2016-05-03 17:18:19 -07:00
Baligh Uddin
39615178ee
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 28463229
Change-Id: I80bbe7ca3bf53da96b2dc52907b8ca7950281a56
2016-05-03 17:16:47 -07:00
Baligh Uddin
f9d29c391d
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 28463229
Change-Id: I4d269572319b49c8e9dc336f05d18309419ea812
2016-05-03 17:15:31 -07:00
Baligh Uddin
f10270dd4d
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 28463229
Change-Id: I0f5b249a5bdacdac2c25d7f2749788cbdfec39fe
2016-05-03 17:13:27 -07:00
Baligh Uddin
4b0500756d
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 28463229
Change-Id: Ia9394c3e4b04ceefbcf12503c69df00fafc62495
2016-05-03 17:12:15 -07:00
Baligh Uddin
610e87310e
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 28463229
Change-Id: If5df56492630f8708bbbccb875856f9635206f78
2016-05-03 17:11:12 -07:00
Bill Yi
8c2fe0a4f6
Import translations. DO NOT MERGE
...
am: 33da550
-s ours
* commit '33da5501b91ef63d008446047ec59ec0bcd74d18':
Import translations. DO NOT MERGE
Change-Id: I163849806633e7986e1de19367ead498c0a4e249
2016-04-04 19:44:00 +00:00
Bill Yi
33da5501b9
Import translations. DO NOT MERGE
...
Change-Id: Icc1edaa3ec28e11ed6520e3363d6b210fe7ee335
Auto-generated-cl: translation import
2016-04-04 11:13:59 -07:00
Dan Albert
eee3201c74
Merge "Stop mixing and matching platform and NDK."
...
am: b0d902f
* commit 'b0d902f2e4f90ee4fd0eda46fa16133bdd2d09d8':
Stop mixing and matching platform and NDK.
2016-03-24 01:34:51 +00:00
Dan Albert
b0d902f2e4
Merge "Stop mixing and matching platform and NDK."
2016-03-24 01:26:09 +00:00
Dan Albert
a4e9383971
Stop mixing and matching platform and NDK.
...
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
2016-03-22 17:06:45 -07:00
Geoff Mendal
126c6bdd25
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: aa89882
-s ours
* commit 'aa89882508f514cca4972f4b4011324c5949049e':
Import translations. DO NOT MERGE
2016-03-19 02:37:13 +00:00
Geoff Mendal
fd22f77ba3
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 4024459
-s ours
* commit '4024459f0dead33dee901e0d6b6b53fd6e16164f':
Import translations. DO NOT MERGE
2016-03-19 02:37:12 +00:00