Jeff Sharkey
|
cbfdfa90ad
|
Merge "Return to modifying raw /mnt/media_rw paths." into pi-dev am: f7d3e028ae
am: 1394fd25ca
Change-Id: If6904b6dc431dab74e326b75f37b58ee3c99feef
|
2018-05-02 18:10:07 -07:00 |
|
android-build-team Robot
|
c4e8cde88d
|
Merge "Preventing zombie process creation." into pi-dev am: ca6f36532d
am: 193c893b01
Change-Id: Id32203ab069343410a02c03956a7c6135f8a1b33
|
2018-05-02 18:05:11 -07:00 |
|
Selim Cinek
|
eb20982906
|
Merge "Fix incorrect icon alignment on shelf" into pi-dev am: 33540449fc
am: 5a647deab3
Change-Id: I7741ad0635a4ba46eab29718b9e2bfed5f307f9f
|
2018-05-02 17:57:14 -07:00 |
|
Ryan Mitchell
|
461b3001f6
|
Merge "AAPT2: Fix quoted text in res/xml assets" into pi-dev am: 150bafd217
am: cc6e856522
Change-Id: Ie22b644b07da19fcc51e59529f5e38ee2f1f9137
|
2018-05-02 17:49:08 -07:00 |
|
Lucas Dupin
|
3278aa86fc
|
Merge "Fix NPE when casting" into pi-dev am: 9115d371c3
am: 40ee4178f4
Change-Id: I348116fdb5e6ebe5f9c72c53643d4a0d38bafe6f
|
2018-05-02 17:39:29 -07:00 |
|
android-build-team Robot
|
3fdd62c52f
|
Merge "Invoke create_recording_canvas correctly in macro bench tests" into pi-dev am: f28901f6c5
am: 72b1215615
Change-Id: Ic704d134a33bb9cfbda2ae88fce3571bda5176fa
|
2018-05-02 17:26:55 -07:00 |
|
android-build-team Robot
|
4e3eb4470d
|
Merge "Use Wi-Fi content description in StatusBarWifiView" into pi-dev am: 057698e511
am: 6f206165f8
Change-Id: I5796aad5c053c6ea548451cc4b15dc3245aabd09
|
2018-05-02 17:05:09 -07:00 |
|
android-build-team Robot
|
e95c273e31
|
[automerger skipped] Merge changes from topic "ifaceStatsDetail" into pi-dev am: e696cf636d -s ours
am: 6f0b8dfeca -s ours
Change-Id: I885775a92a7fde71f4ea5b6167045aab2600bc1a
|
2018-05-02 16:39:10 -07:00 |
|
Chenbo Feng
|
d4dcdb11c5
|
[automerger skipped] Remove the unused file parsing function am: bbabc51b5b -s ours
am: e30fa557f1 -s ours
Change-Id: Id18c037613b38f8c031b475d6cb81704b026eec7
|
2018-05-02 14:45:47 -07:00 |
|
Chia-I Wu
|
996652c4ae
|
Merge "Update Configuration#isScreenWideColorGamut doc" into pi-dev am: 067749725e
am: 4f6d5393cb
Change-Id: Ieffece2062f99dba6f99c16934393f71f2e486a1
|
2018-05-02 14:41:42 -07:00 |
|
android-build-team Robot
|
749099ba35
|
Merge "Merge "Fix DemoMode icon spacing" into pi-dev am: ee18fb2112" into pi-dev-plus-aosp
am: f5f2c674d9
Change-Id: Ibb174bcd48e48e535bb4cf407445fa072c340f83
|
2018-05-02 14:38:09 -07:00 |
|
Yang Lu
|
890db383f9
|
Merge "Lock the pulling alarm handler." into pi-dev am: 493bb2b119
am: 2eccd835de
Change-Id: I4c488e49c74021459b4a86ba9d596bed2e2007c1
|
2018-05-02 14:31:12 -07:00 |
|
Jeff Sharkey
|
1394fd25ca
|
Merge "Return to modifying raw /mnt/media_rw paths." into pi-dev
am: f7d3e028ae
Change-Id: I61692ebdc49233923863ce773bb42a07498551b0
|
2018-05-02 14:29:10 -07:00 |
|
Gopinath Elanchezhian
|
5bc59492d0
|
Merge "Add 'ss' trace category in app launch test." into pi-dev am: 0b96d863c6
am: 3b5f321008
Change-Id: I6cf9f1abcbe44740b2fb9ab77fcb66fe05399502
|
2018-05-02 14:27:42 -07:00 |
|
android-build-team Robot
|
dba9b84ab8
|
Merge "Work on issue #77931346: The notification that should not be named appeared" into pi-dev am: 12f404e3e3
am: 0c728e411a
Change-Id: Id0396b3974fe21bc346040bb4fd78d935777f782
|
2018-05-02 14:24:15 -07:00 |
|
android-build-team Robot
|
4c3c016acd
|
Merge "Fixed that some notifications were expandable by just a few pixels" into pi-dev am: c5b780517e
am: 521ec6e677
Change-Id: I418271fad701c698bb79ba813749597d9a09b832
|
2018-05-02 14:20:51 -07:00 |
|
Anton Hansson
|
b365836d8e
|
Merge "frameworks/base: Update a few more references to android.jar." am: 85e68063a9 am: 52e98e1b7a
am: 0f185f8b19
Change-Id: I84aebb1697c0217ea9063a2c6b71e8d4a3c6b1a7
|
2018-05-02 14:17:26 -07:00 |
|
android-build-team Robot
|
193c893b01
|
Merge "Preventing zombie process creation." into pi-dev
am: ca6f36532d
Change-Id: Ie0c1ea1d658f719262f3e7473046a732915d7284
|
2018-05-02 14:17:18 -07:00 |
|
Jeff Sharkey
|
f7d3e028ae
|
Merge "Return to modifying raw /mnt/media_rw paths." into pi-dev
|
2018-05-02 21:14:17 +00:00 |
|
Jack Yu
|
13f9e36a69
|
Merge "Enabled area info update for India" into pi-dev am: 530c4c1f0f
am: 7d7a6e2d0e
Change-Id: Ia648e97e3bbd4fde13932392142be5c5071a88c2
|
2018-05-02 14:09:16 -07:00 |
|
android-build-team Robot
|
3bbebdd3c7
|
Merge "Fix issue #78230210: Strobe: Need separate runtime permission group for READ_CALL_LOG and WRITE_CALL_LOG" into pi-dev am: 06defc2a31
am: 0bd5e9860c
Change-Id: Ie58474a88d616afd698bc1e124262f89bdfa07f1
|
2018-05-02 14:04:25 -07:00 |
|
Selim Cinek
|
5a647deab3
|
Merge "Fix incorrect icon alignment on shelf" into pi-dev
am: 33540449fc
Change-Id: I11b7166b0179b28a347dfa017f7681ef5e93c1fd
|
2018-05-02 14:02:11 -07:00 |
|
Hyunyoung Song
|
bb6d6d3f25
|
Merge "Log OVERVIEW_ACTIVITY via MetricsLogger in quickstep Test: is done on ub-launcher3-edmonton branch that uses this library function Bug: 77920179" into pi-dev am: d7f98ac19e
am: 5486d76bd5
Change-Id: I206ca34c61390745988a7284e117bf7ba8c404d0
|
2018-05-02 14:01:02 -07:00 |
|
android-build-team Robot
|
ca6f36532d
|
Merge "Preventing zombie process creation." into pi-dev
|
2018-05-02 20:58:14 +00:00 |
|
Victor Hsieh
|
86187caf1b
|
Avoid using 0 for fs-verity extension ID am: 4cf738204f
am: fed62ac9a3
Change-Id: Ic5ac29de7bdd615f7d173a6ab2e72cf34a6bca32
|
2018-05-02 13:57:11 -07:00 |
|
Ryan Mitchell
|
60f06b7770
|
Merge "AAPT2: Fixed id parsing error" into pi-dev am: f4c089dd90
am: 932c44d329
Change-Id: I661784fcabac19d4d9bae137904b9282d9765d79
|
2018-05-02 13:55:05 -07:00 |
|
Rohan Shah
|
8a88fc3db6
|
Merge "[Notif] Update guts/blocking helper UI" into pi-dev am: 33b57e845f
am: 83d84d2f45
Change-Id: I67936c1523f05f6fb73b70af6dd01aa625b722bc
|
2018-05-02 13:51:51 -07:00 |
|
Anton Hansson
|
5a6f250151
|
Merge "Update apidiff source files to use new api location." into pi-dev-plus-aosp
am: e16051a077
Change-Id: I533d3a012b2e1641b7da7b9a36c5bb4690c65969
|
2018-05-02 13:49:05 -07:00 |
|
Adrian Roos
|
8f2144810e
|
[automerger skipped] Fix build more am: d9d5f654c7 -s ours am: 4b6a13ed45 -s ours
am: 4cfc86c77d -s ours
Change-Id: Icb94ab7b291eaf1efb99254daa5b35b7ac94943e
|
2018-05-02 13:45:13 -07:00 |
|
Ryan Mitchell
|
cc6e856522
|
Merge "AAPT2: Fix quoted text in res/xml assets" into pi-dev
am: 150bafd217
Change-Id: I5bb4a63234cf3ee022bbf59edd5b613abefd8bef
|
2018-05-02 13:43:45 -07:00 |
|
Adrian Roos
|
e397c2b2a8
|
[automerger skipped] Fix build am: 3e0fd90693 -s ours am: fc1149dba1 -s ours
am: cbb989a358 -s ours
Change-Id: I027b3b93ce9087d57a7f398a9dbee65a6a231a63
|
2018-05-02 13:41:24 -07:00 |
|
Adrian Roos
|
4977395ae3
|
[automerger skipped] OC-MR1 DisplayCutout XML API am: 361580459e -s ours am: 14a40ac705 -s ours
am: ca977a3bb3 -s ours
Change-Id: I99b08f1f7faae27533f3c76fa12c011e77f260e1
|
2018-05-02 13:37:47 -07:00 |
|
Selim Cinek
|
33540449fc
|
Merge "Fix incorrect icon alignment on shelf" into pi-dev
|
2018-05-02 20:36:24 +00:00 |
|
Lucas Dupin
|
40ee4178f4
|
Merge "Fix NPE when casting" into pi-dev
am: 9115d371c3
Change-Id: I03443603d0d05b164031c439e6a897238cf56be0
|
2018-05-02 13:35:45 -07:00 |
|
android-build-team Robot
|
8488392b13
|
Merge "Greylist updates from bugreports, Wednesday edition." into pi-dev am: 05b5cfd453
am: cd356ac079
Change-Id: I290570a94bc6e55d1348f644a3d1df5e3a7abc5a
|
2018-05-02 13:34:11 -07:00 |
|
David Brazdil
|
3973a36aa1
|
[automerger skipped] Build hidden API DEX signatures with Soong
am: 51c439d79c -s ours
Change-Id: I2c4a09f12d2f4e1d4b1361903451d2ef680be0f0
|
2018-05-02 13:30:55 -07:00 |
|
Mihai Popa
|
f86a6e94da
|
Merge "[Magnifier-43] Refactor to remove code duplication" into pi-dev am: 90f197efe5
am: c184c0a7c6
Change-Id: I6fa2652be36d503432723a6eb03ddf60aa0eec0e
|
2018-05-02 13:29:40 -07:00 |
|
android-build-team Robot
|
8554efe125
|
Merge "Fix RTL TileLayout." into pi-dev am: 12a1c46a67
am: b45d584232
Change-Id: Iaff810337741c102ab586d44d2321265f00c1dce
|
2018-05-02 13:25:33 -07:00 |
|
Ryan Mitchell
|
150bafd217
|
Merge "AAPT2: Fix quoted text in res/xml assets" into pi-dev
|
2018-05-02 20:23:49 +00:00 |
|
David Brazdil
|
f6ac4fcc4a
|
Merge non-SDK @removed API and light greylist am: 0585533a85
am: 0319384019
Change-Id: I12b381db7ee6c745c49e8dc2016adc03dc622302
|
2018-05-02 13:22:09 -07:00 |
|
Lucas Dupin
|
9115d371c3
|
Merge "Fix NPE when casting" into pi-dev
|
2018-05-02 20:20:51 +00:00 |
|
David Brazdil
|
ad1b972493
|
[automerger skipped] Merge "Build list of @removed API's dex signatures" into pi-dev am: 839cec4478 -s ours
am: df5c2acf86 -s ours
Change-Id: I541f11631638c598036a01cfa1a4748af07481c4
|
2018-05-02 13:19:41 -07:00 |
|
android-build-team Robot
|
16529cfda7
|
Merge "Flip the cross profile apps animation" into pi-dev am: 1bbe397856
am: b7a3f9ccb3
Change-Id: I4a6cc498d808e4f1f3984d7b6acc2b46477ad4a1
|
2018-05-02 13:16:50 -07:00 |
|
David Brazdil
|
da268d56dd
|
[automerger skipped] Merge "resolve merge conflicts of 4d213e5856 to pi-dev-plus-aosp" into pi-dev-plus-aosp
am: b0795638f1 -s ours
Change-Id: I40da4d4de3e46e0cc9c560f4d546b0fa0ab566f3
|
2018-05-02 13:13:29 -07:00 |
|
Nicolas Geoffray
|
ab5500c2b3
|
Merge "Add more light grey APIs." into pi-dev am: f90e8323ff
am: 93a10e1a5b
Change-Id: I08ff1bb784b87d2fb8944067c10bb1c989e3e9e5
|
2018-05-02 13:09:09 -07:00 |
|
Philip P. Moltmann
|
9e7655ac5e
|
Merge "don't block adb while running uninstall"
|
2018-05-02 19:57:20 +00:00 |
|
android-build-team Robot
|
3f936e16d2
|
Merge "resolve merge conflicts of e323532e81 to master"
|
2018-05-02 19:53:51 +00:00 |
|
android-build-team Robot
|
72b1215615
|
Merge "Invoke create_recording_canvas correctly in macro bench tests" into pi-dev
am: f28901f6c5
Change-Id: I855fec4f3cf126485999a008cec9648967cbf21f
|
2018-05-02 12:52:01 -07:00 |
|
android-build-team Robot
|
6f206165f8
|
Merge "Use Wi-Fi content description in StatusBarWifiView" into pi-dev
am: 057698e511
Change-Id: Ibe278a8d5830b7345de40feda17390e09d3dab20
|
2018-05-02 12:47:11 -07:00 |
|
android-build-team Robot
|
6f0b8dfeca
|
[automerger skipped] Merge changes from topic "ifaceStatsDetail" into pi-dev
am: e696cf636d -s ours
Change-Id: Ia25540fd865f6040e2a5d943c19b2a12965c4d5b
|
2018-05-02 12:42:24 -07:00 |
|