297958 Commits

Author SHA1 Message Date
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
TreeHugger Robot
0221d16cf4 Merge "Allow only U+0020..U+007E characters for axis tag." 2016-12-02 19:48:57 +00:00
Jeff Sharkey
0e673a8143 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" into cw-f-dev
am: 2e73db5b9c

Change-Id: I1af1fa92fbf8a46037d8622f04269590af5706b9
2016-12-02 19:48:23 +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
f199d511c3 Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am: ae7d4b1339 -s ours am: ce477912a2 am: 920b02a94f -s ours am: aff9286bd6 am: 37ff2d56bf am: 56247334f8
am: 923aef8e02  -s ours

Change-Id: Ia0d0ac5ed1f8a84bd9158530fde499f91ac7f411
2016-12-02 19:46:36 +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
0eaa192436 DO NOT MERGE. Check provider access for content changes. am: 9b85862620 -s ours am: 9277cce7fa am: a1d1ecbe05 -s ours am: 928c09cd8e am: 5267b63325 am: a51ebb828a
am: acfda3d71a  -s ours

Change-Id: I0857c3cdd2e471ad04dbafc22a7898168a615a24
2016-12-02 19:45:33 +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
3fa188bd8f Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am: 6b89229d14 am: a7efe16fe1 -s ours am: f1085f2dc8 am: c130d7fd5e am: 948841362a
am: 7e54dc58d4  -s ours

Change-Id: I3dce2baad70e1d9d606c27534f4ff4e9435f2445
2016-12-02 19:44:38 +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
836b54e6bb DO NOT MERGE. Check provider access for content changes. am: 91add43ae7 am: 792d49dfb5 -s ours am: 32af84320b am: 8b5fa0c0c0 am: d081cb0ab7
am: cd35e746dc  -s ours

Change-Id: I12608bbd9173dc053df967174bc59f9297a151c2
2016-12-02 19:43:33 +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
Fyodor Kupolov
55dac08a81 Merge "Added get-privapp-permissions command" 2016-12-02 19:36:26 +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
Android Build Merger (Role)
2e73db5b9c 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" into cw-f-dev 2016-12-02 19:33:12 +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
923aef8e02 Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am: ae7d4b1339 -s ours am: ce477912a2 am: 920b02a94f -s ours am: aff9286bd6 am: 37ff2d56bf
am: 56247334f8

Change-Id: I8bf5769fbb68fb10a4acd2c557dc1c66a3c448df
2016-12-02 19:29:15 +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
Jeff Sharkey
acfda3d71a DO NOT MERGE. Check provider access for content changes. am: 9b85862620 -s ours am: 9277cce7fa am: a1d1ecbe05 -s ours am: 928c09cd8e am: 5267b63325
am: a51ebb828a

Change-Id: Ic67fac2e28ab776632a98e3556c46826d7335a91
2016-12-02 19:28:18 +00:00
Jeff Sharkey
71e4281969 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

Change-Id: I5d2e9c9faa81ddc2c1f29d10aaa8ef7567209969
2016-12-02 19:28:14 +00:00
Jeff Sharkey
a75ce3a705 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

Change-Id: Ia05929a5edcc75490d8388008380d5db8f7edc85
2016-12-02 19:27:26 +00:00
Jeff Sharkey
7e54dc58d4 Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am: 6b89229d14 am: a7efe16fe1 -s ours am: f1085f2dc8 am: c130d7fd5e
am: 948841362a

Change-Id: I66fdc5fb2ca169453b6b2f5dc7d6c10360aea709
2016-12-02 19:27:23 +00:00
Jeff Sharkey
10cdb1130e DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb am: 8165a22f53
am: 270d1c27ac

Change-Id: I426e531fd2fda1e09276dcfdc774fb548eedbefd
2016-12-02 19:26:31 +00:00
Jeff Sharkey
cd35e746dc DO NOT MERGE. Check provider access for content changes. am: 91add43ae7 am: 792d49dfb5 -s ours am: 32af84320b am: 8b5fa0c0c0
am: d081cb0ab7

Change-Id: I3fc3458a9050e1ee9cb57b9348d67ccd3ce71037
2016-12-02 19:26:28 +00:00
Jeff Sharkey
d3f689bf14 Switch over to new "time.android.com" NTP pool.
Also add logging to measure success/failure details.

Test: builds, boots, and NTP fix obtained
Bug: 32969463
Change-Id: I66a8a78480e087acdcf8a11e79f80b7a7a4969c9
2016-12-02 12:25:03 -07:00
Jeff Sharkey
8fdc5ca042 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev am: 0be332852e -s ours am: b685f719f1 am: 45b6a52225 am: 34b87d94e4 am: 30ef1ad5be am: 5fafe8ea7c
am: f923e8c06f  -s ours

Change-Id: Icd8cf530943f0acaa6fe55a3f5a7b8668a48adff
2016-12-02 19:23:59 +00:00
Jeff Sharkey
875fb481a6 DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours am: 3f0e7465cb am: b88d8dc58f am: b4638e2d88 am: bf9a60106b am: 4d80f89b19
am: f88aada344  -s ours

Change-Id: I57b4bfb5a5c928a961659a5daf8f16d54957d319
2016-12-02 19:22:55 +00:00
Jeff Sharkey
bcd0e63c56 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev am: 0be332852e -s ours am: b685f719f1 am: 45b6a52225 am: 34b87d94e4 am: 30ef1ad5be am: 652521ae7b
am: 292bee2f74  -s ours

Change-Id: I2be817a6f58b8bbcd050123dd987424603d702f9
2016-12-02 19:21:57 +00:00
Treehugger Robot
c60963e451 Merge "Remove static link in Android framework under /frameworks/base." 2016-12-02 19:21:47 +00:00
Jeff Sharkey
f00515f4d9 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

Change-Id: I40a0cb7f416d843b12893656d16dfed97d0df058
2016-12-02 19:21:21 +00:00
Jeff Sharkey
12b2f8a275 DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a -s ours am: c067e76bba
am: 0891ca2fad

Change-Id: I2e9897c052ee296d68beb50b6ac927e5a0d92daa
2016-12-02 19:20:23 +00:00
Android Build Merger (Role)
455ac29812 Merge "DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours am: 3f0e7465cb am: b88d8dc58f am: b4638e2d88 am: bf9a60106b am: 1afc4b8425 am: d40f62eae8 -s ours" 2016-12-02 19:19:31 +00:00
Jeff Sharkey
07ad2a9063 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

Change-Id: I35d8c2faba5a6f359bbe51b56052bafe90a6cac1
2016-12-02 19:19:29 +00:00
Jeff Sharkey
4a46817792 DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours am: 3f0e7465cb am: b88d8dc58f am: b4638e2d88 am: bf9a60106b am: 1afc4b8425
am: d40f62eae8  -s ours

Change-Id: I01f32e0afc3cae31ec34484833f62ea1f6e6cc54
2016-12-02 19:19:00 +00:00
Android Build Merger (Role)
d2c984112d Merge "Merge "Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d am: 414334595e am: 26e6918800 am: ef5d241938 am: 48313052ab" into nyc-mr2-dev-plus-aosp am: d1534dc14a -s ours" 2016-12-02 19:18:47 +00:00
Jeff Sharkey
270d1c27ac DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb
am: 8165a22f53

Change-Id: Iee87f3c3d384bf785b3c6c877a817c35bbdb478b
2016-12-02 19:18:31 +00:00
Android Build Merger (Role)
01ba0174a9 Merge "Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d am: 414334595e am: 26e6918800 am: ef5d241938 am: 48313052ab am: 938649a13c -s ours" 2016-12-02 19:18:30 +00:00
Jeff Sharkey
a19374443a Merge "Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d am: 414334595e am: 26e6918800 am: ef5d241938 am: 48313052ab" into nyc-mr2-dev-plus-aosp
am: d1534dc14a  -s ours

Change-Id: I902b6cef1b88e15329d9aa0980de4427c9076aa9
2016-12-02 19:17:42 +00:00
Jeff Sharkey
38327384b5 Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d am: 414334595e am: 26e6918800 am: ef5d241938 am: 48313052ab
am: 938649a13c  -s ours

Change-Id: I97048cde71a23c627a618a9217e2fcfc7ffff2c3
2016-12-02 19:17:37 +00:00
Android Build Merger (Role)
02b5012805 Merge "Merge "Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d am: 414334595e am: 26e6918800 am: ef5d241938 am: 29c335ef2e" into nyc-mr2-dev-plus-aosp am: 1c0d8bf73c -s ours" 2016-12-02 19:17:14 +00:00