Bill Yi
a9e9732c5c
Import translations. DO NOT MERGE
...
Change-Id: Ic51dd0b7dd13a6a26134b258860fcd26980b6b50
Auto-generated-cl: translation import
2018-04-15 23:37:05 -07:00
TreeHugger Robot
d8adb99295
Merge "Update utility class Emoji.java for Emoji 11"
2018-04-13 22:19:32 +00:00
Yi Jin
e2bb6487f7
Merge "Reduce disk space limit for incident reports." into pi-dev am: a991071db9
...
am: 634acf3aa0
2018-04-13 14:12:21 -07:00
Etan Cohen
9a7f511577
Merge "[RTT] Wi-Fi RTT Metrics" into pi-dev am: 0e100add48
...
am: 9b8684a1e6
2018-04-13 14:06:18 -07:00
Yi Jin
634acf3aa0
Merge "Reduce disk space limit for incident reports." into pi-dev
...
am: a991071db9
2018-04-13 14:00:16 -07:00
Siyamed Sinir
213388d254
Update utility class Emoji.java for Emoji 11
...
This CL removes the Emoji 5.0 info from Emoji.java since they are
supported by ICU. It adds emoji added in Emoji 11.
Test: atest android.text.EmojiTest
Test: Verified that ICU handles Emoji 5.0 emoji
Test: Verified hardware keyboard backspace with hair color emoji
Test: Visually verified cursor moves with hardware keyboard
Bug: 77148691
Change-Id: I40b290fcea201cf5e35ad4c461f8d8056b8c3739
2018-04-13 14:00:15 -07:00
TreeHugger Robot
965f6aa5e2
Merge "Add constant for bluetooth fragment"
2018-04-13 20:56:18 +00:00
Etan Cohen
9b8684a1e6
Merge "[RTT] Wi-Fi RTT Metrics" into pi-dev
...
am: 0e100add48
2018-04-13 13:52:35 -07:00
Jason Parks
92d0b65b12
Merge "Allow Device Owners/Profile Owners to set the interruption filter." into pi-dev am: a668c66301
...
am: 591ed6c7fe
2018-04-13 13:36:39 -07:00
TreeHugger Robot
a991071db9
Merge "Reduce disk space limit for incident reports." into pi-dev
2018-04-13 20:34:31 +00:00
Etan Cohen
0e100add48
Merge "[RTT] Wi-Fi RTT Metrics" into pi-dev
2018-04-13 20:29:22 +00:00
Jason Parks
591ed6c7fe
Merge "Allow Device Owners/Profile Owners to set the interruption filter." into pi-dev
...
am: a668c66301
2018-04-13 13:25:27 -07:00
Bill Yi
42218af2cf
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 3ab97957fe -s ours
...
am: 3364258130
2018-04-13 13:21:11 -07:00
Bill Yi
3364258130
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 3ab97957fe
2018-04-13 13:00:26 -07:00
Robert Carr
e066da3075
Merge "ViewRoot: Ensure we release surface from setWindowStopped." into pi-dev am: 75bb177d95
...
am: 576b4e9c02
2018-04-13 13:00:17 -07:00
Jason Parks
a668c66301
Merge "Allow Device Owners/Profile Owners to set the interruption filter." into pi-dev
2018-04-13 19:56:20 +00:00
Robert Carr
576b4e9c02
Merge "ViewRoot: Ensure we release surface from setWindowStopped." into pi-dev
...
am: 75bb177d95
2018-04-13 12:49:34 -07:00
TreeHugger Robot
3ab97957fe
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-04-13 19:42:18 +00:00
Bill Yi
ea72b70a48
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 589bdcd1f6 -s ours
...
am: 01db8c5648
2018-04-13 12:39:19 -07:00
TreeHugger Robot
75bb177d95
Merge "ViewRoot: Ensure we release surface from setWindowStopped." into pi-dev
2018-04-13 19:31:52 +00:00
Jovana Knezevic
34996d7f3a
Merge "Merge "Prevents showing Guests in switcher." into pi-dev am: 027a967389" into pi-dev-plus-aosp
...
am: d8cc6c5307
2018-04-13 12:31:46 -07:00
Nan Zhang
c5b448892a
[automerger skipped] Merge "Add filegroup for supporting apache-http stubs generation." am: 828f14d58a am: 25a088a857 -s ours
...
am: 152b882488
2018-04-13 12:21:34 -07:00
Fan Zhang
973754489f
Merge "Add optional metadata to specify icon's background color." into pi-dev am: 72634cae72
...
am: 7ecc1ff2b4
2018-04-13 12:10:15 -07:00
Bill Yi
01db8c5648
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 589bdcd1f6
2018-04-13 12:05:34 -07:00
Bill Yi
5f3b05699a
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: f2799545f5 -s ours
...
am: 5ea19f4fb5
2018-04-13 12:04:35 -07:00
Android Build Merger (Role)
d8cc6c5307
Merge "Merge "Prevents showing Guests in switcher." into pi-dev am: 027a967389" into pi-dev-plus-aosp
2018-04-13 19:00:16 +00:00
Jovana Knezevic
e647252dac
Merge "Prevents showing Guests in switcher." into pi-dev
...
am: 027a967389
2018-04-13 11:59:46 -07:00
Ryan Mitchell
780453ac02
Merge "AAPT2: GetBag infinite recursion fix" into pi-dev am: 3ddd801449
...
am: 7b13ad69ec
2018-04-13 11:59:02 -07:00
Nan Zhang
152b882488
[automerger skipped] Merge "Add filegroup for supporting apache-http stubs generation." am: 828f14d58a
...
am: 25a088a857
2018-04-13 11:57:32 -07:00
TreeHugger Robot
589bdcd1f6
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-04-13 18:47:30 +00:00
Fan Zhang
7ecc1ff2b4
Merge "Add optional metadata to specify icon's background color." into pi-dev
...
am: 72634cae72
2018-04-13 11:45:57 -07:00
Nan Zhang
25a088a857
Merge "Add filegroup for supporting apache-http stubs generation."
...
am: 828f14d58a
2018-04-13 11:39:54 -07:00
Bill Yi
5ea19f4fb5
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: f2799545f5
2018-04-13 11:38:17 -07:00
Bill Yi
f8b86b05ff
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 7e41f31bc2 -s ours
...
am: c1d18390b1
2018-04-13 11:33:55 -07:00
Ryan Mitchell
7b13ad69ec
Merge "AAPT2: GetBag infinite recursion fix" into pi-dev
...
am: 3ddd801449
2018-04-13 11:31:37 -07:00
Bill Yi
d1a3b737a7
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: b6134dc727 -s ours
...
am: 930851666b
2018-04-13 11:27:44 -07:00
Bill Yi
703b9a059c
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 04543e7ab3 -s ours
...
am: e7fd15af09
2018-04-13 11:26:03 -07:00
Bill Yi
c1d18390b1
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 7e41f31bc2
2018-04-13 11:24:00 -07:00
Bill Yi
27a0824355
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 2e9addbad7 -s ours
...
am: 972b49678e
2018-04-13 11:23:41 -07:00
Bill Yi
d4e9257624
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 04e0ef903e -s ours
...
am: 14602e4a79
2018-04-13 11:21:05 -07:00
Bill Yi
930851666b
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: b6134dc727
2018-04-13 11:15:51 -07:00
Bill Yi
2f034500c5
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 213639c93e -s ours
...
am: 0875bc7463
2018-04-13 11:14:08 -07:00
Bill Yi
e7fd15af09
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 04543e7ab3
2018-04-13 11:13:15 -07:00
Michael Wright
4cf175b4ed
Merge "Revert "Fixed power manager CTS test."" into pi-dev am: ca1dcfb23e
...
am: ad93f44a3e
2018-04-13 11:11:05 -07:00
Bill Yi
972b49678e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 2e9addbad7
2018-04-13 11:07:48 -07:00
Bill Yi
14602e4a79
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 04e0ef903e
2018-04-13 11:05:54 -07:00
Bill Yi
0875bc7463
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 213639c93e
2018-04-13 11:03:22 -07:00
Michael Wright
ad93f44a3e
Merge "Revert "Fixed power manager CTS test."" into pi-dev
...
am: ca1dcfb23e
2018-04-13 10:59:47 -07:00
Bill Yi
f1c82fa6cc
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 07d10c7ac5 -s ours
...
am: 32a7b15762
2018-04-13 10:56:46 -07:00
Salvador Martinez
8e89968c6b
Add constant for bluetooth fragment
...
simply adds a metrics constant for the new bluetooth screen
Bug: 77543471
Test: robotests pass
Change-Id: Id6317df4b86def4e0aa095fd3bc1ed544c0f0220
2018-04-13 10:53:00 -07:00
