Bill Yi
521faf362a
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
...
am: 50f02f9d0a
2016-10-27 05:09:19 +00:00
Bill Yi
044be18ae4
Import translations. DO NOT MERGE am: d1b8917270 -s ours
...
am: 6296c78ee4
2016-10-27 05:09:19 +00:00
Bill Yi
0c78c9e049
Import translations. DO NOT MERGE
...
am: 6e3055ee37
2016-10-27 05:09:14 +00:00
Bill Yi
f0a5ebb129
Merge "Import translations. DO NOT MERGE" into cw-f-dev
...
am: 41912188e5
2016-10-27 05:08:10 +00:00
Bill Yi
305004ba4d
Import translations. DO NOT MERGE
...
am: bff09ae3c8
2016-10-27 05:08:08 +00:00
Bill Yi
c7b922bb83
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
...
am: 000e2093d2
2016-10-27 05:08:01 +00:00
Bill Yi
5eb8d7f3f3
Import translations. DO NOT MERGE
...
am: fc0224f880
2016-10-27 05:07:56 +00:00
Bill Yi
4cb84a4c59
Import translations. DO NOT MERGE am: c541a19fba -s ours am: 18608133d8 -s ours
...
am: 1653bfafc4
2016-10-27 05:07:03 +00:00
Bill Yi
6b8d9b2337
Merge "Import translations. DO NOT MERGE" into cw-f-dev
...
am: c2effd95e2
2016-10-27 05:07:00 +00:00
Bill Yi
316c6df269
Import translations. DO NOT MERGE
...
am: 644a22437f
2016-10-27 05:06:59 +00:00
Bill Yi
3b2c3fe5ef
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: 43905cc9ac
2016-10-27 05:04:27 +00:00
Bill Yi
df305805c6
Import translations. DO NOT MERGE
...
am: 1377e2b985
2016-10-27 05:04:25 +00:00
Bill Yi
51a63d873b
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: a2b301d0e1 -s ours
...
am: 68d6955b45
2016-10-27 05:04:11 +00:00
Bill Yi
d557ea9388
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: ad45d97c45
2016-10-27 05:03:08 +00:00
Bill Yi
6296c78ee4
Import translations. DO NOT MERGE
...
am: d1b8917270
2016-10-27 05:03:06 +00:00
Bill Yi
cb96dfd12a
Import translations. DO NOT MERGE am: aad661f874 -s ours
...
am: f21106b0e8
2016-10-27 05:03:06 +00:00
TreeHugger Robot
41912188e5
Merge "Import translations. DO NOT MERGE" into cw-f-dev
2016-10-27 05:01:35 +00:00
TreeHugger Robot
c2effd95e2
Merge "Import translations. DO NOT MERGE" into cw-f-dev
2016-10-27 05:01:06 +00:00
Android Build Merger (Role)
d37981be5a
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 696b0e4d9f -s ours am: b9cc1f603c -s ours" into nyc-mr2-dev
2016-10-27 05:00:38 +00:00
TreeHugger Robot
50f02f9d0a
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
2016-10-27 05:00:18 +00:00
TreeHugger Robot
000e2093d2
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
2016-10-27 04:59:55 +00:00
Bill Yi
38948cf86d
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 696b0e4d9f -s ours
...
am: b9cc1f603c
2016-10-27 04:59:49 +00:00
TreeHugger Robot
ca04d19b2d
Merge "Import translations. DO NOT MERGE"
2016-10-27 04:59:30 +00:00
TreeHugger Robot
3bd340f8e3
Merge "Import translations. DO NOT MERGE"
2016-10-27 04:59:01 +00:00
Bill Yi
1653bfafc4
Import translations. DO NOT MERGE am: c541a19fba -s ours
...
am: 18608133d8
2016-10-27 04:59:00 +00:00
TreeHugger Robot
43905cc9ac
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-10-27 04:58:37 +00:00
TreeHugger Robot
ef2f13f25a
Merge "Import translations. DO NOT MERGE"
2016-10-27 04:57:46 +00:00
TreeHugger Robot
ad45d97c45
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-10-27 04:57:01 +00:00
Bill Yi
68d6955b45
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
...
am: a2b301d0e1
2016-10-27 04:54:38 +00:00
Bill Yi
f21106b0e8
Import translations. DO NOT MERGE
...
am: aad661f874
2016-10-27 04:54:34 +00:00
Bill Yi
b9cc1f603c
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: 696b0e4d9f
2016-10-27 04:54:33 +00:00
Bill Yi
18608133d8
Import translations. DO NOT MERGE
...
am: c541a19fba
2016-10-27 04:54:31 +00:00
TreeHugger Robot
abdb26ae6a
Merge "Import translations. DO NOT MERGE"
2016-10-27 04:50:41 +00:00
TreeHugger Robot
a2b301d0e1
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
2016-10-27 04:50:13 +00:00
TreeHugger Robot
696b0e4d9f
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-10-27 04:45:01 +00:00
TreeHugger Robot
b629f36601
Merge "AAPT2: Rename to match new style"
2016-10-27 04:31:05 +00:00
Bill Yi
aad661f874
Import translations. DO NOT MERGE
...
Change-Id: I01dfed1e6db0d4fe5cff72df3cec234400085fde
Auto-generated-cl: translation import
2016-10-26 20:18:34 -07:00
Bill Yi
c541a19fba
Import translations. DO NOT MERGE
...
Change-Id: I637b457c6e9a20345cd5dbe599c4dce15ca9040c
Auto-generated-cl: translation import
2016-10-26 20:12:01 -07:00
Bill Yi
9c5ccf4b97
Import translations. DO NOT MERGE
...
Change-Id: I0f32e71b1e47beacb5e11d77bb7939fd2b2f5eb7
Auto-generated-cl: translation import
2016-10-26 19:59:45 -07:00
TreeHugger Robot
ed9ee58170
Merge "resolve merge conflicts of 1238daf to master"
2016-10-27 02:50:25 +00:00
TreeHugger Robot
60544d58fe
Merge "Adding option to swipe to dismiss."
2016-10-27 02:48:10 +00:00
Adam Lesinski
ce5e56e243
AAPT2: Rename to match new style
...
Use Google3 naming style to match new
projects' and open source google projects' style.
Preferred to do this in a massive CL so as to avoid
style inconsistencies that plague legacy code bases.
This is a relatively NEW code base, may as well keep
it up to date.
Test: name/style refactor - existing tests pass
Change-Id: Ie80ecb78d46ec53efdfca2336bb57d96cbb7fb87
2016-10-26 19:30:23 -07:00
TreeHugger Robot
3916c8f033
Merge "Removed temporary workaround for multi-window assist crash."
2016-10-27 02:09:48 +00:00
TreeHugger Robot
4e55f8a47c
Merge "Remove unneeded libraries from libmedia_jni"
2016-10-27 01:01:14 +00:00
Marie Janssen
1e012d93c7
resolve merge conflicts of 1238daf to master
...
Change-Id: Icc70d291379d4f4816881e46704197513e6d548e
2016-10-26 17:57:22 -07:00
Tomasz Mikolajewski
1815241e78
Merge "Remove no longer used FLAG_ARCHIVE."
2016-10-27 00:56:31 +00:00
Hugo Benichi
c8c1027762
ConnectivityServiceTest: mark flaky test as such
...
This patch extracts into its own independent test a test sub-block looking
for a race condition when not waiting on handlers to become idle:
there is no way to prevent the race from not happening when looking for
it this way. This makes the test flakky.
This new independent test is tagged with @FlakkyTest(tolerance = 3).
Test: ConnectivityServiceTest passes, with higher probability.
Bug: 31479480
Change-Id: Ic0e2ffbe669f2ea8cc62e8a0d4763703368db019
2016-10-27 09:38:54 +09:00
Marie Janssen
1238daf20d
Bluetooth: prevent enabling BLE in airplane mode am: a80d745c65 am: 6affbde556
...
am: 73bfd25356
2016-10-27 00:29:51 +00:00
Marie Janssen
73bfd25356
Bluetooth: prevent enabling BLE in airplane mode am: a80d745c65
...
am: 6affbde556
2016-10-27 00:24:48 +00:00
Marie Janssen
6affbde556
Bluetooth: prevent enabling BLE in airplane mode
...
am: a80d745c65
2016-10-27 00:20:17 +00:00
