Commit Graph

278885 Commits

Author SHA1 Message Date
Android Build Merger (Role)
6cb8cff20a Merge "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" into nyc-mr1-dev-plus-aosp am: a2a069e998" into nyc-mr2-dev-plus-aosp 2016-12-02 20:00:40 +00:00
Android Build Merger (Role)
3ef390afb2 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: 95d6c7e59a" into nyc-mr2-dev-plus-aosp 2016-12-02 20:00:18 +00:00
Jeff Sharkey
8a97e90f9c 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" into nyc-mr1-dev-plus-aosp
am: a2a069e998

Change-Id: Iade0f5f736c2cce1539117d86ec9483d405b67e8
2016-12-02 19:59:42 +00:00
Jeff Sharkey
50a914886c 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: 95d6c7e59a

Change-Id: Ic0aa44fa241f771f65cc3d1c3f67e7f5ca23328c
2016-12-02 19:59:38 +00:00
Android Build Merger (Role)
2282ec207f Merge "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" into nyc-mr1-dev-plus-aosp am: ec7e6c33d7" into nyc-mr2-dev-plus-aosp 2016-12-02 19:59:16 +00:00
Android Build Merger (Role)
214b523a6a 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: b09bcc7328" into nyc-mr2-dev-plus-aosp 2016-12-02 19:58:58 +00:00
Jeff Sharkey
5697bc0dfc 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" into nyc-mr1-dev-plus-aosp
am: ec7e6c33d7

Change-Id: I0433ba9b9f5e9becfcbad63aeada156e49c28bd3
2016-12-02 19:58:20 +00:00
Jeff Sharkey
bfd33d0377 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: b09bcc7328

Change-Id: I3ce2a8af99fa9229bb373eb59686bc4a5a760319
2016-12-02 19:58:12 +00:00
Android Build Merger (Role)
0c7267b698 Merge "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" into nyc-mr1-dev-plus-aosp am: 2bfad25b06" into nyc-mr2-dev-plus-aosp 2016-12-02 19:57: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
3d83246be3 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" into nyc-mr1-dev-plus-aosp
am: 2bfad25b06

Change-Id: I3945f337de1d941779a5f5018a86c87ca494bc9e
2016-12-02 19:56:42 +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
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
Android Build Merger (Role)
a2a069e998 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" into nyc-mr1-dev-plus-aosp 2016-12-02 19:49:04 +00:00
Jeff Sharkey
95d6c7e59a 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: I4829c70ed4cfe981d7b07394ed75c1132ca6ebc8
2016-12-02 19:48:08 +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
Android Build Merger (Role)
ec7e6c33d7 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" into nyc-mr1-dev-plus-aosp 2016-12-02 19:47:27 +00:00
Jeff Sharkey
b09bcc7328 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: I7e1a159f80c05ad0656133ff545305fb04203ab9
2016-12-02 19:46:49 +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
Android Build Merger (Role)
2bfad25b06 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" into nyc-mr1-dev-plus-aosp 2016-12-02 19:46:20 +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
Jeff Sharkey
b46e9bb9cb 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: Ic4004d4923cc544a4babc457bc5cdb024bc9ee51
2016-12-02 19:44:25 +00:00
Android Build Merger (Role)
fb9a16a3f3 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 2016-12-02 19:44:22 +00:00
Jaekyun Seok
ae21f6f5b0 Merge "Remove static link in Android framework under /frameworks/base." am: c60963e451
am: 5705ad69db

Change-Id: I3f2c38332115a7b52b893629f2a5007d75c2831d
2016-12-02 19:43:36 +00:00
Jeff Sharkey
45ba8593c0 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

Change-Id: I8ad049d8577a5bcc1fac76b0644a90b4b4f495aa
2016-12-02 19:43:34 +00:00
Jeff Sharkey
dd09c12a61 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

Change-Id: Idfe644ae174419c698987de336e072208468866f
2016-12-02 19:43:28 +00:00
Jaekyun Seok
5705ad69db Merge "Remove static link in Android framework under /frameworks/base."
am: c60963e451

Change-Id: I0bbb3cf9a66752f6ee8218a4ac5545091130bbed
2016-12-02 19:35:03 +00:00
Jeff Sharkey
17d6ba41b8 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

Change-Id: I667f20343f23366c2530a5ea658a5414c45f2799
2016-12-02 19:32:36 +00:00
Jeff Sharkey
5bf382063d 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

Change-Id: Iafa9dd90fe36a10d781d92d236faa671178b2737
2016-12-02 19:29:14 +00:00