Jeff Sharkey
|
68361d3951
|
Merge "DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a -s ours am: c067e76bba am: 0891ca2fad am: 12b2f8a275 am: 71e4281969 am: 0af2fdee40" into nyc-mr2-dev-plus-aosp
am: 89ecf83fa6 -s ours
Change-Id: I01a9ae19bc9ae3d1eed5285f47fff4d5c8f9fa9e
|
2016-12-02 20:33:32 +00:00 |
|
Jeff Sharkey
|
faec3f668d
|
DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a -s ours am: c067e76bba am: 0891ca2fad am: 12b2f8a275 am: 71e4281969 am: 0af2fdee40
am: a5b6631392 -s ours
Change-Id: I7a95ca3a057bebce4fe1c704edbddbc41bb542b2
|
2016-12-02 20:33:27 +00:00 |
|
Jeff Sharkey
|
3db4918f97
|
Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9 am: 17d6ba41b8 am: 9ce28af49c" into nyc-mr2-dev-plus-aosp
am: 0596e4f267 -s ours
Change-Id: I49c764e81462f096d7b4833d913a84ad700db1dd
|
2016-12-02 20:32:02 +00:00 |
|
Jeff Sharkey
|
515ade4db0
|
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9 am: 17d6ba41b8 am: 9ce28af49c
am: ec4dfe1584 -s ours
Change-Id: I31337e47b260845377d3cac1beec9950defe14fa
|
2016-12-02 20:31:56 +00:00 |
|
Jeff Sharkey
|
b958a927af
|
Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9 am: 5bf382063d am: f196c044f3" into nyc-mr2-dev-plus-aosp
am: 05c36cb1ca -s ours
Change-Id: Iff2218f7a5e2cfb9f42339d91d4cbee6f6f79b49
|
2016-12-02 20:30:17 +00:00 |
|
Jeff Sharkey
|
176b98764d
|
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9 am: 5bf382063d am: f196c044f3
am: 80328894a6 -s ours
Change-Id: I030ea5da0dd0c8a3f6cd1d9782187d16ac5fb788
|
2016-12-02 20:30:11 +00:00 |
|
Jeff Sharkey
|
80f8915f9b
|
Merge "Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746 -s ours am: aeeb9c8470 am: 8c74832d5e am: 07ad2a9063 am: a75ce3a705" into nyc-mr1-dev-plus-aosp am: 30aca837c8" into nyc-mr2-dev-plus-aosp
am: c0e91458bf -s ours
Change-Id: Iae55b7bc8f4ace84533e7ddfc13b9bb0edd28c98
|
2016-12-02 20:28:26 +00:00 |
|
Jeff Sharkey
|
d1946896ce
|
Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746 -s ours am: aeeb9c8470 am: 8c74832d5e am: 07ad2a9063 am: a75ce3a705" into nyc-mr1-dev-plus-aosp am: 30aca837c8
am: 811f10c209 -s ours
Change-Id: Id919ca839e6ae8418381a454b8aa3e95ca363f6d
|
2016-12-02 20:28:22 +00:00 |
|
Jeff Sharkey
|
ea74fbcb1e
|
Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746 -s ours am: aeeb9c8470 am: 8c74832d5e am: 07ad2a9063 am: a75ce3a705 am: 0ae6bb63ea" into nyc-mr2-dev-plus-aosp
am: 6cbcfe78c9 -s ours
Change-Id: Ic7d54919f93534aa60f311ba46735b497b5010c2
|
2016-12-02 20:27:07 +00:00 |
|
Jeff Sharkey
|
5c776b254b
|
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746 -s ours am: aeeb9c8470 am: 8c74832d5e am: 07ad2a9063 am: a75ce3a705 am: 0ae6bb63ea
am: d9a1804962 -s ours
Change-Id: I18f1aa9f5e0bad29c79d41430b027e508c1cd2f4
|
2016-12-02 20:27:03 +00:00 |
|
Jeff Sharkey
|
3e4eadd96d
|
Merge "DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a -s ours am: c067e76bba am: 0891ca2fad am: 12b2f8a275 am: 71e4281969 am: d01f22d0b2" into nyc-mr2-dev-plus-aosp
am: 70c962bdd6 -s ours
Change-Id: Id92c124e3cf24b88ec031b0b7a4e298bf3f2a087
|
2016-12-02 20:25:37 +00:00 |
|
Jeff Sharkey
|
fb439d65ea
|
DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a -s ours am: c067e76bba am: 0891ca2fad am: 12b2f8a275 am: 71e4281969 am: d01f22d0b2
am: 7d72a117ef -s ours
Change-Id: Ia0853bd47bfaa1d76ffbe1f952aeaf09c238cf6a
|
2016-12-02 20:25:31 +00:00 |
|
Jeff Sharkey
|
01f73e09f5
|
Merge "Merge "DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53 am: 270d1c27ac am: 10cdb1130e" into nyc-mr1-dev-plus-aosp am: fb9a16a3f3" into nyc-mr2-dev-plus-aosp
am: 29c4a517fe -s ours
Change-Id: Ibdc5e1f9a7a7798a6d8ba9e10daa986a08199b59
|
2016-12-02 20:24:01 +00:00 |
|
Jeff Sharkey
|
8a1cff06c2
|
Merge "DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53 am: 270d1c27ac am: 10cdb1130e" into nyc-mr1-dev-plus-aosp am: fb9a16a3f3
am: 84938307a9 -s ours
Change-Id: I27d9fc94ea345cf8481295efab717ceb552b3177
|
2016-12-02 20:23:54 +00:00 |
|
Jeff Sharkey
|
a6e6391eac
|
Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746 -s ours am: aeeb9c8470 am: 8c74832d5e am: 07ad2a9063 am: a75ce3a705 am: b46e9bb9cb" into nyc-mr2-dev-plus-aosp
am: b249844ee2 -s ours
Change-Id: I78f423d26cd023085f87ac3be5a7c8588985ad22
|
2016-12-02 20:22:18 +00:00 |
|
Jeff Sharkey
|
b6ced762ed
|
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746 -s ours am: aeeb9c8470 am: 8c74832d5e am: 07ad2a9063 am: a75ce3a705 am: b46e9bb9cb
am: fc532f77fc -s ours
Change-Id: I485f0bcc55613495a3278bf84f21baee63435435
|
2016-12-02 20:22:12 +00:00 |
|
Jeff Sharkey
|
df8c02566d
|
Merge "DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53 am: 270d1c27ac am: 10cdb1130e am: 45ba8593c0" into nyc-mr2-dev-plus-aosp
am: 545b2f2083 -s ours
Change-Id: I35712adaaaf8bfb9cdec9d524fdb1b5099986ef7
|
2016-12-02 20:20:36 +00:00 |
|
Jeff Sharkey
|
94169a7536
|
DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53 am: 270d1c27ac am: 10cdb1130e am: 45ba8593c0
am: 736acb1073 -s ours
Change-Id: I72c690f9cb77178dacb78abe8754eb5656b352e5
|
2016-12-02 20:20:30 +00:00 |
|
Jeff Sharkey
|
e4563c78e8
|
Merge "DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53 am: 270d1c27ac am: 10cdb1130e am: dd09c12a61" into nyc-mr2-dev-plus-aosp
am: c91876dcf3 -s ours
Change-Id: I43f0b24f245d56ef3a49a716d9dffffe70da1ae9
|
2016-12-02 20:18:50 +00:00 |
|
Jeff Sharkey
|
24cc84c835
|
DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53 am: 270d1c27ac am: 10cdb1130e am: dd09c12a61
am: e98f3f4d08 -s ours
Change-Id: Ib7f656cbbfdfb6332583fb750444dcb974f33a5f
|
2016-12-02 20:18:44 +00:00 |
|
Jaekyun Seok
|
c9770fed47
|
Merge "Remove static link in Android framework under /frameworks/base." am: c60963e451 am: 5705ad69db am: ae21f6f5b0
am: 195caa6696 -s ours
Change-Id: If30455d6043d7e63e48bf2773198bd80f2524937
|
2016-12-02 20:17:37 +00:00 |
|
Android Build Merger (Role)
|
89ecf83fa6
|
Merge "DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a -s ours am: c067e76bba am: 0891ca2fad am: 12b2f8a275 am: 71e4281969 am: 0af2fdee40" into nyc-mr2-dev-plus-aosp
|
2016-12-02 19:57:19 +00:00 |
|
Android Build Merger (Role)
|
0596e4f267
|
Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9 am: 17d6ba41b8 am: 9ce28af49c" into nyc-mr2-dev-plus-aosp
|
2016-12-02 19:57:16 +00:00 |
|
Jeff Sharkey
|
ec4dfe1584
|
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9 am: 17d6ba41b8
am: 9ce28af49c
Change-Id: I3769d3e20e8eba1859b87386d67cebec3ab4b436
|
2016-12-02 19:56:37 +00:00 |
|
Jeff Sharkey
|
a5b6631392
|
DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a -s ours am: c067e76bba am: 0891ca2fad am: 12b2f8a275 am: 71e4281969
am: 0af2fdee40
Change-Id: Ie3a3686ab2013859300609ac06a1fe64fbd5873b
|
2016-12-02 19:56:32 +00:00 |
|
Android Build Merger (Role)
|
05c36cb1ca
|
Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9 am: 5bf382063d am: f196c044f3" into nyc-mr2-dev-plus-aosp
|
2016-12-02 19:56:07 +00:00 |
|
Android Build Merger (Role)
|
c0e91458bf
|
Merge "Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746 -s ours am: aeeb9c8470 am: 8c74832d5e am: 07ad2a9063 am: a75ce3a705" into nyc-mr1-dev-plus-aosp am: 30aca837c8" into nyc-mr2-dev-plus-aosp
|
2016-12-02 19:55:52 +00:00 |
|
TreeHugger Robot
|
0730df7369
|
Merge "Allow some app windows to display above the IME."
|
2016-12-02 19:55:52 +00:00 |
|
Android Build Merger (Role)
|
6cbcfe78c9
|
Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746 -s ours am: aeeb9c8470 am: 8c74832d5e am: 07ad2a9063 am: a75ce3a705 am: 0ae6bb63ea" into nyc-mr2-dev-plus-aosp
|
2016-12-02 19:55:31 +00:00 |
|
Jeff Sharkey
|
80328894a6
|
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9 am: 5bf382063d
am: f196c044f3
Change-Id: Ice4d59eb90c422903b88ec8870ea0dbcffdd9e45
|
2016-12-02 19:55:29 +00:00 |
|
Android Build Merger (Role)
|
70c962bdd6
|
Merge "DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a -s ours am: c067e76bba am: 0891ca2fad am: 12b2f8a275 am: 71e4281969 am: d01f22d0b2" into nyc-mr2-dev-plus-aosp
|
2016-12-02 19:55:01 +00:00 |
|
Jeff Sharkey
|
811f10c209
|
Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746 -s ours am: aeeb9c8470 am: 8c74832d5e am: 07ad2a9063 am: a75ce3a705" into nyc-mr1-dev-plus-aosp
am: 30aca837c8
Change-Id: I376248947975df72dd8e597f2ed17d469e58c39e
|
2016-12-02 19:54:49 +00:00 |
|
Jeff Sharkey
|
d9a1804962
|
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746 -s ours am: aeeb9c8470 am: 8c74832d5e am: 07ad2a9063 am: a75ce3a705
am: 0ae6bb63ea
Change-Id: I54329c81374eff14c24984bfa606e53e67e64355
|
2016-12-02 19:54:38 +00:00 |
|
Jeff Sharkey
|
7d72a117ef
|
DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a -s ours am: c067e76bba am: 0891ca2fad am: 12b2f8a275 am: 71e4281969
am: d01f22d0b2
Change-Id: I5c2448b22546d9cc0582b1d0fcc2d8090cc41dee
|
2016-12-02 19:54:22 +00:00 |
|
Android Build Merger (Role)
|
29c4a517fe
|
Merge "Merge "DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53 am: 270d1c27ac am: 10cdb1130e" into nyc-mr1-dev-plus-aosp am: fb9a16a3f3" into nyc-mr2-dev-plus-aosp
|
2016-12-02 19:54:01 +00:00 |
|
Android Build Merger (Role)
|
b249844ee2
|
Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746 -s ours am: aeeb9c8470 am: 8c74832d5e am: 07ad2a9063 am: a75ce3a705 am: b46e9bb9cb" into nyc-mr2-dev-plus-aosp
|
2016-12-02 19:53:52 +00:00 |
|
Android Build Merger (Role)
|
545b2f2083
|
Merge "DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53 am: 270d1c27ac am: 10cdb1130e am: 45ba8593c0" into nyc-mr2-dev-plus-aosp
|
2016-12-02 19:53:42 +00:00 |
|
Jeff Sharkey
|
fc532f77fc
|
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746 -s ours am: aeeb9c8470 am: 8c74832d5e am: 07ad2a9063 am: a75ce3a705
am: b46e9bb9cb
Change-Id: I68c9a03a42a89530aeadc25aa601bbdef7ebc78c
|
2016-12-02 19:53:13 +00:00 |
|
Jeff Sharkey
|
84938307a9
|
Merge "DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53 am: 270d1c27ac am: 10cdb1130e" into nyc-mr1-dev-plus-aosp
am: fb9a16a3f3
Change-Id: I3a8f1049cb6cbf2b2885943fbea7dba31364234a
|
2016-12-02 19:53:00 +00:00 |
|
Jeff Sharkey
|
736acb1073
|
DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53 am: 270d1c27ac am: 10cdb1130e
am: 45ba8593c0
Change-Id: I2040801dcb090ea635e5840232130d69ee14aef8
|
2016-12-02 19:52:56 +00:00 |
|
Android Build Merger (Role)
|
c91876dcf3
|
Merge "DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53 am: 270d1c27ac am: 10cdb1130e am: dd09c12a61" into nyc-mr2-dev-plus-aosp
|
2016-12-02 19:52:53 +00:00 |
|
Jeff Sharkey
|
e98f3f4d08
|
DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53 am: 270d1c27ac am: 10cdb1130e
am: dd09c12a61
Change-Id: I724f1a005adb3c743daa974228838eff0ec9cca2
|
2016-12-02 19:52:06 +00:00 |
|
Jaekyun Seok
|
195caa6696
|
Merge "Remove static link in Android framework under /frameworks/base." am: c60963e451 am: 5705ad69db
am: ae21f6f5b0
Change-Id: Ie0306a1e3dc80f6ee6ad9669b91d150167b04586
|
2016-12-02 19:51:59 +00:00 |
|
TreeHugger Robot
|
0221d16cf4
|
Merge "Allow only U+0020..U+007E characters for axis tag."
|
2016-12-02 19:48:57 +00:00 |
|
Jeff Sharkey
|
9ce28af49c
|
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9
am: 17d6ba41b8
Change-Id: Idb7d2abaaf9809afd070e012dca6988ced2bf22c
|
2016-12-02 19:47:38 +00:00 |
|
Jeff Sharkey
|
f196c044f3
|
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9
am: 5bf382063d
Change-Id: Ibef588aa9d1b61c31bb2c0ecfada658ed2574981
|
2016-12-02 19:46:22 +00:00 |
|
Jeff Sharkey
|
0af2fdee40
|
DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a -s ours am: c067e76bba am: 0891ca2fad am: 12b2f8a275
am: 71e4281969
Change-Id: Ib5924ea52d194ab1ad61392e54d3a6222108a1b4
|
2016-12-02 19:45:36 +00:00 |
|
Jeff Sharkey
|
d01f22d0b2
|
DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a -s ours am: c067e76bba am: 0891ca2fad am: 12b2f8a275
am: 71e4281969
Change-Id: I61d48d60faa4b8a7e06a72df277f5f2a5180de92
|
2016-12-02 19:45:19 +00:00 |
|
Android Build Merger (Role)
|
30aca837c8
|
Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746 -s ours am: aeeb9c8470 am: 8c74832d5e am: 07ad2a9063 am: a75ce3a705" into nyc-mr1-dev-plus-aosp
|
2016-12-02 19:45:16 +00:00 |
|
Jeff Sharkey
|
0ae6bb63ea
|
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746 -s ours am: aeeb9c8470 am: 8c74832d5e am: 07ad2a9063
am: a75ce3a705
Change-Id: I58024db3b95f3650d24b0cb3daea13fe91a8a49e
|
2016-12-02 19:44:41 +00:00 |
|