Android Build Merger (Role)
bb346a929f
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 732a35eb23
-s ours am: f107987432
-s ours" into nyc-mr1-dev-plus-aosp
2016-05-04 01:40:26 +00:00
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
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
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
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
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
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
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
Geoff Mendal
7cfe3ab05a
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: c8395b8
-s ours
* commit 'c8395b88018a2d18e7cd0b46888600626493d3c8':
Import translations. DO NOT MERGE
2016-03-19 02:37:12 +00:00
Geoff Mendal
e03bcd10ce
Import translations. DO NOT MERGE
...
am: 36ef606
-s ours
* commit '36ef6068fd1e91635a7d515d752595c9f37cd5da':
Import translations. DO NOT MERGE
2016-03-19 02:37:11 +00:00
Geoff Mendal
aa89882508
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-03-19 02:35:32 +00:00
Geoff Mendal
4024459f0d
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-03-19 02:35:00 +00:00
Geoff Mendal
a8fcb7664c
Import translations. DO NOT MERGE
...
Change-Id: Ie8dddc467e695a05206fcbc8e0ec6cbcb66108ee
Auto-generated-cl: translation import
2016-03-18 22:34:19 -04:00
Geoff Mendal
0178a854f2
Import translations. DO NOT MERGE
...
Change-Id: I16a6b97b27126824e7a2f58c82af51485cfa1171
Auto-generated-cl: translation import
2016-03-18 22:33:06 -04:00
Geoff Mendal
c8395b8801
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-03-19 02:31:52 +00:00
Geoff Mendal
6a55e5731d
Import translations. DO NOT MERGE
...
Change-Id: I412e1b013c24b9e4464fb7800630a300388e1ad8
Auto-generated-cl: translation import
2016-03-18 22:30:12 -04:00
Geoff Mendal
36ef6068fd
Import translations. DO NOT MERGE
...
Change-Id: I0ec016baae37e091b250af7cd9a1ff1d9df3ef73
Auto-generated-cl: translation import
2016-03-18 22:27:33 -04:00
Jeff Sharkey
1775b73f2b
Follow framework refactoring.
...
am: a9298f8
* commit 'a9298f88442aae49a0817513209230e3e6e8d4e0':
Follow framework refactoring.
2016-03-17 22:14:24 +00:00
Jeff Sharkey
a9298f8844
Follow framework refactoring.
...
Bug: 27531029
Change-Id: I7ebd335e68a5ca44348e19544d1ec66be60cdd88
2016-03-17 11:34:21 -06:00
Keisuke Kuroyanagi
b31cd18ea6
Merge "Start full screen mode on first tap when HW keyborad is connected." into nyc-dev
...
am: c29921f
* commit 'c29921fe7c3f3efb47c6c760055e773bd030ca35':
Start full screen mode on first tap when HW keyborad is connected.
2016-03-16 06:40:25 +00:00
Keisuke Kuroyanagi
c29921fe7c
Merge "Start full screen mode on first tap when HW keyborad is connected." into nyc-dev
2016-03-16 06:33:08 +00:00
Keisuke Kuroyanagi
48adccf349
Start full screen mode on first tap when HW keyborad is connected.
...
LatinIME checks hardware keyboard presence and software keyboard
visibility to decide whether to start full screen mode.
This doesn't work well with the recent update on "Show input method"
(Bug: 22517687, Id4d332e3909590c68345e).
On the first tap, software keyboard is not shown and hardware keyboard
is connected; so full screen mode is not started. However,
onEvaluateInputViewShown may return true ant software keyboard may be
brought up.
In this care, on the second tap, software keyboard is visible so full
screen mode will be started regardless of hardware keyboard presence.
This CL checks onEvaluateInputViewShown to decide whether to start
full screen mode.
Bug: 27234709
Change-Id: I587262cc36e5fccc59620b4bd2d2c3c05c72232f
2016-03-15 18:42:46 +09:00
Yohei Yukawa
fb6242581f
Change "touch" to "tap" in LatinIME.
...
am: 2715add718
* commit '2715add7181729655860518b10e03a85599d6777':
Change "touch" to "tap" in LatinIME.
2016-03-14 14:58:04 +00:00
Yohei Yukawa
2715add718
Change "touch" to "tap" in LatinIME.
...
Bug: 26883567
Change-Id: I580ee65bfa0c53c219f71a17a0e0c08cf70368fb
2016-03-11 22:33:14 -08:00
Geoff Mendal
e1aab2c58c
Import translations. DO NOT MERGE
...
am: f836c0f641
-s ours
* commit 'f836c0f64145afd0dc9d0256c6667acf6af13e48':
Import translations. DO NOT MERGE
2016-03-09 13:21:36 +00:00
Geoff Mendal
f836c0f641
Import translations. DO NOT MERGE
...
Change-Id: Ia05e008bcc73b8b66bff4d739e5a2b1b57f19ffb
Auto-generated-cl: translation import
2016-03-09 05:13:51 -08:00