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
Baligh Uddin
bd517fb3bb
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2016-02-27 05:30:00 +00:00
Baligh Uddin
522adee3cf
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 27293916
Change-Id: I36bea98ac38c04e0ec8439923b5c1167c3fa721b
2016-02-26 17:22:55 -08:00
Baligh Uddin
65fa229539
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 27293916
Change-Id: I3fae20273707ff85d3d0a15cf3a7c423b40fabf6
2016-02-26 17:20:47 -08:00
Baligh Uddin
033ee4cfce
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2016-02-25 16:23:30 +00:00
Baligh Uddin
0f0e6d9caf
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2016-02-25 16:23:28 +00:00
Baligh Uddin
4fc7c8d2b7
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2016-02-25 16:23:26 +00:00
Baligh Uddin
da7fcf9734
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2016-02-25 16:23:24 +00:00
Baligh Uddin
8573a177e2
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2016-02-25 16:23:22 +00:00
Baligh Uddin
9dc556a5e3
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2016-02-25 16:23:20 +00:00
Baligh Uddin
cb83108117
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 27293916
Change-Id: Ib7859a1e462deaea6024653192f1242164311371
2016-02-23 15:03:10 -08:00
Baligh Uddin
11d116c406
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 27293916
Change-Id: I51c0478e91b05478b5b75be36e57675afc5beb25
2016-02-23 14:58:15 -08:00
Baligh Uddin
8721958ce5
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 27293916
Change-Id: Id6852e18eaf95fb1cdf6b63aa8c626f945274e4a
2016-02-23 14:57:06 -08:00
Baligh Uddin
47a77c5103
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 27293916
Change-Id: If0761e4bbf0f72db381aba5bee2e4a84e94f73f9
2016-02-23 14:56:20 -08:00
Baligh Uddin
b34c902d03
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 27293916
Change-Id: I072c4ba9c14014d1192799e84a87128f6f58b80d
2016-02-23 14:55:15 -08:00
Baligh Uddin
7e68c71c50
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 27293916
Change-Id: Iaec5e7483fa88c51485fc48ac0dffdc2ba62daf1
2016-02-23 14:54:23 -08:00
Baligh Uddin
96a2d556ad
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 27293916
Change-Id: I2f61355323125b3b8e70d35b0685dea0ff64b1b2
2016-02-23 14:53:39 -08:00
Geoff Mendal
717f0100b4
Import translations. DO NOT MERGE am: f6d1c5f323
-s ours
...
am: ac0f805945
-s ours
* commit 'ac0f805945c4ef1ded149f56c1b183a307153844':
Import translations. DO NOT MERGE
2015-12-07 23:29:11 +00:00
Geoff Mendal
ac0f805945
Import translations. DO NOT MERGE
...
am: f6d1c5f323
-s ours
* commit 'f6d1c5f323edf3e68b3009f8b13d661fea031902':
Import translations. DO NOT MERGE
2015-12-07 23:06:42 +00:00
Geoff Mendal
1785399828
Import translations. DO NOT MERGE
...
am: d3f580fcb7
-s ours
* commit 'd3f580fcb76c3b15f5ca8b0e32255535d0e6b42f':
Import translations. DO NOT MERGE
2015-12-07 23:05:54 +00:00
Geoff Mendal
d3f580fcb7
Import translations. DO NOT MERGE
...
Change-Id: Iad6a7df2c517e80c376c92197b505ae76276e71b
Auto-generated-cl: translation import
2015-12-07 05:17:27 -08:00
Geoff Mendal
f6d1c5f323
Import translations. DO NOT MERGE
...
Change-Id: Iad1409117bddf84a193f3999bbc502ad36c2ad84
Auto-generated-cl: translation import
2015-12-07 05:15:13 -08:00
Geoff Mendal
21211be33f
Import translations. DO NOT MERGE am: fdbd6fe212
-s ours am: c2483d98b5
-s ours am: b8442588a3
-s ours
...
am: fded2f954a
-s ours
* commit 'fded2f954aaff90107c6cb4783d50c76ad64eace':
Import translations. DO NOT MERGE
2015-11-25 16:30:42 +00:00
Geoff Mendal
fded2f954a
Import translations. DO NOT MERGE am: fdbd6fe212
-s ours am: c2483d98b5
-s ours
...
am: b8442588a3
-s ours
* commit 'b8442588a3e05884c874059aed1806f783952a50':
Import translations. DO NOT MERGE
2015-11-25 16:26:19 +00:00
Geoff Mendal
b8442588a3
Import translations. DO NOT MERGE am: fdbd6fe212
-s ours
...
am: c2483d98b5
-s ours
* commit 'c2483d98b58977b80bb3645bfdee516eedab2141':
Import translations. DO NOT MERGE
2015-11-25 16:22:36 +00:00
Geoff Mendal
da6bf40d24
Import translations. DO NOT MERGE am: 888712e489
-s ours
...
am: 9d3f4154a5
-s ours
* commit '9d3f4154a512c86a1842c51c01cefbca7bef67ef':
Import translations. DO NOT MERGE
2015-11-25 16:22:29 +00:00
Geoff Mendal
c2483d98b5
Import translations. DO NOT MERGE
...
am: fdbd6fe212
-s ours
* commit 'fdbd6fe212eafe89c889a900fe235dfd5141b10b':
Import translations. DO NOT MERGE
2015-11-25 16:17:45 +00:00
Geoff Mendal
9d3f4154a5
Import translations. DO NOT MERGE
...
am: 888712e489
-s ours
* commit '888712e489befd4092136ae0ed509769d23eb25c':
Import translations. DO NOT MERGE
2015-11-25 16:17:37 +00:00
Geoff Mendal
178327afe9
Import translations. DO NOT MERGE
...
am: 83fdba1427
-s ours
* commit '83fdba1427aa86ff27d006dd425c76f6bdaf5b47':
Import translations. DO NOT MERGE
2015-11-25 16:17:37 +00:00
Geoff Mendal
fdbd6fe212
Import translations. DO NOT MERGE
...
Change-Id: I3b0659978c7d5b8d37020621ce41a56366cf0b27
Auto-generated-cl: translation import
2015-11-25 05:42:06 -08:00
Geoff Mendal
83fdba1427
Import translations. DO NOT MERGE
...
Change-Id: Ic32df26eab46cdedabbbf63ed3b659680b518743
Auto-generated-cl: translation import
2015-11-25 05:37:55 -08:00
Geoff Mendal
888712e489
Import translations. DO NOT MERGE
...
Change-Id: If7cc2bd21fbc9f806909e544495cce1acf951b29
Auto-generated-cl: translation import
2015-11-25 05:35:56 -08:00
Geoff Mendal
6715af85a0
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: b8643b22c6
-s ours
...
am: 9287820e6d
-s ours
* commit '9287820e6d59a75defe578ff6a7d22baa8c62275':
Import translations. DO NOT MERGE
2015-11-18 01:04:28 +00:00
Geoff Mendal
2c62a6008e
Import translations. DO NOT MERGE am: 006c30a36e
-s ours
...
am: c6b1a4fba1
-s ours
* commit 'c6b1a4fba154c0579671fbf14c376da38239b9c6':
Import translations. DO NOT MERGE
2015-11-18 01:04:13 +00:00
Geoff Mendal
e63c15dd64
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
...
am: 9d435e6f43
-s ours
* commit '9d435e6f43baf1ac5a9df38b584646b08015b64c':
Import translations. DO NOT MERGE
2015-11-18 01:00:07 +00:00
Geoff Mendal
7b43157e7b
Import translations. DO NOT MERGE
...
am: 5dbecb8409
-s ours
* commit '5dbecb8409f32a7322d33746916e8c417b770147':
Import translations. DO NOT MERGE
2015-11-18 00:59:30 +00:00
Geoff Mendal
9287820e6d
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
...
am: b8643b22c6
-s ours
* commit 'b8643b22c6c5aba3fb362ba2feda7b5fa8ff2014':
Import translations. DO NOT MERGE
2015-11-16 16:16:36 +00:00
Geoff Mendal
c6b1a4fba1
Import translations. DO NOT MERGE
...
am: 006c30a36e
-s ours
* commit '006c30a36eec7914481860724332d44b3cb8d718':
Import translations. DO NOT MERGE
2015-11-16 16:16:19 +00:00
Geoff Mendal
9d435e6f43
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
2015-11-16 15:50:52 +00:00
Geoff Mendal
b8643b22c6
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
2015-11-16 15:50:23 +00:00
Geoff Mendal
3b5421bae1
Import translations. DO NOT MERGE
...
Change-Id: I72546cce9ec50ddb468bbd3d989ceb3b6adb4627
Auto-generated-cl: translation import
2015-11-16 06:39:54 -08:00
Geoff Mendal
5dbecb8409
Import translations. DO NOT MERGE
...
Change-Id: I42db5a73ba835ce778019b8375fce0c7b1271e15
Auto-generated-cl: translation import
2015-11-16 06:39:05 -08:00
Geoff Mendal
6cca573fbe
Import translations. DO NOT MERGE
...
Change-Id: Id9670893071d981904e3a9eca8ebef55ac1cc265
Auto-generated-cl: translation import
2015-11-16 06:37:44 -08:00
Geoff Mendal
006c30a36e
Import translations. DO NOT MERGE
...
Change-Id: Iab1557d1610a2b3a68f9a29b1bff565a83fe3ff0
Auto-generated-cl: translation import
2015-11-16 06:36:54 -08:00
Geoff Mendal
7d605cf082
Import translations. DO NOT MERGE am: 76218d9045
-s ours am: b6e8df2cf1
-s ours
...
am: 23d90ed34d
-s ours
* commit '23d90ed34d78ee9af8865f67cceee0415ba6cf9c':
Import translations. DO NOT MERGE
2015-11-14 15:11:23 +00:00
Geoff Mendal
23d90ed34d
Import translations. DO NOT MERGE am: 76218d9045
-s ours
...
am: b6e8df2cf1
-s ours
* commit 'b6e8df2cf10acff16a0267483ec3764b8f78a617':
Import translations. DO NOT MERGE
2015-11-14 15:08:29 +00:00
Geoff Mendal
b6e8df2cf1
Import translations. DO NOT MERGE
...
am: 76218d9045
-s ours
* commit '76218d9045409d1881a72a20ece23dc6371070e7':
Import translations. DO NOT MERGE
2015-11-14 15:05:33 +00:00
Geoff Mendal
76218d9045
Import translations. DO NOT MERGE
...
Change-Id: I2f10dd89298df82a8cf092a0de3d4a635ab7e696
Auto-generated-cl: translation import
2015-11-14 06:57:59 -08:00
Chieu Nguyen
8fb57af3e9
Unicode 8.0 emoji additions to Google Keyboard. am: 7674a65367
am: fab2818b96
...
am: 305aef9c87
* commit '305aef9c877205dee2ed5afefb06a2274376a25b':
Unicode 8.0 emoji additions to Google Keyboard.
2015-11-11 22:05:28 +00:00