297898 Commits

Author SHA1 Message Date
TreeHugger Robot
0fb443b8c5 Merge "Switch over to new "time.android.com" NTP pool." 2016-12-02 21:16:05 +00:00
Jeff Sharkey
bd5c6ce582 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 am: f199d511c3 am: 1d752340a7 am: 4aacfce724 am: 5b64f51a1c am: 6fa7e324fe
am: 5100194fbc  -s ours

Change-Id: Ic9fa83c273adf160cebe7517c3ddfc905150553c
2016-12-02 21:02:37 +00:00
Jeff Sharkey
6d113dcef2 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 am: 0eaa192436 am: 43b3a13803 am: 6786309c03 am: a43ee01a6d am: ca76b0420a
am: e5d52664c2  -s ours

Change-Id: I442c44aaa41235660080a4ef4a3eac54da49bca2
2016-12-02 21:01:36 +00:00
Jeff Sharkey
f64a036968 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 am: 3fa188bd8f am: 09960bdfcc am: d12e48494d am: 341813c852 am: 65d1a92c92
am: 01f036ebfd  -s ours

Change-Id: I86abcf0af426c18eb996e21a685dcf050506da30
2016-12-02 21:00:37 +00:00
Jeff Sharkey
fbd6362b98 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 am: 836b54e6bb am: 383e0cfa06 am: a55258bd17 am: 2f48a6ce63 am: 90055d575c
am: 57c8b867c4  -s ours

Change-Id: Ib6d5a414d0b58db436c1b8344d1fd0ef9bd5f766
2016-12-02 20:59:39 +00:00
Jeff Sharkey
5100194fbc 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 am: f199d511c3 am: 1d752340a7 am: 4aacfce724 am: 5b64f51a1c
am: 6fa7e324fe

Change-Id: I537d2e35ef28a2d3a34efa4253e89395b0250c10
2016-12-02 20:54:23 +00:00
Jeff Sharkey
e5d52664c2 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 am: 0eaa192436 am: 43b3a13803 am: 6786309c03 am: a43ee01a6d
am: ca76b0420a

Change-Id: Ibca5f8839dbaaa7380bd9630681bcec60b8e0bf9
2016-12-02 20:53:25 +00:00
Jeff Sharkey
01f036ebfd 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 am: 3fa188bd8f am: 09960bdfcc am: d12e48494d am: 341813c852
am: 65d1a92c92

Change-Id: I9af1728fa9c933884c11c9f6484e6b4700edb912
2016-12-02 20:52:30 +00:00
Jeff Sharkey
57c8b867c4 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 am: 836b54e6bb am: 383e0cfa06 am: a55258bd17 am: 2f48a6ce63
am: 90055d575c

Change-Id: I66d069fcfeb32664a880bf6fc518f2d77b98bf36
2016-12-02 20:51:36 +00:00
Jeff Sharkey
8a8ced9f77 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 am: 1157adb305
am: 2bf8e5abcb  -s ours

Change-Id: I2c917bc370e3cb6c8b0d856cf0ab3b70ef541926
2016-12-02 20:47:04 +00:00
Jeff Sharkey
fde8e3c300 Merge "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" into cw-f-dev am: 2e73db5b9c" into nyc-mr1-dev-plus-aosp am: ed09e67751" into nyc-mr2-dev-plus-aosp
am: 18735cc1a5  -s ours

Change-Id: I8f98aa56334687f8ddc62436cddb671946c5c6b2
2016-12-02 20:45:37 +00:00
Jeff Sharkey
f4e5730cb5 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" into cw-f-dev am: 2e73db5b9c" into nyc-mr1-dev-plus-aosp am: ed09e67751
am: 9397f3c366  -s ours

Change-Id: Ia27daa943c2487d886f75af647086d094eef8c20
2016-12-02 20:45:29 +00:00
Jeff Sharkey
8d9801daea 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" into cw-f-dev am: 2e73db5b9c am: 0e673a8143" into nyc-mr2-dev-plus-aosp
am: 24ce7d651f  -s ours

Change-Id: I6a0d73ace014da7566aa868952953390574cda06
2016-12-02 20:43:58 +00:00
Jeff Sharkey
b55274e6ec 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 am: 0e673a8143
am: e1f2060eab  -s ours

Change-Id: Iadecf5ed497196bb8118d61d0686c80bffd47d99
2016-12-02 20:43:54 +00:00
Jeff Sharkey
0e4aa8c8a1 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
am: 6cb8cff20a  -s ours

Change-Id: Ie73e72a71dea3126d6b9f3a7281cb49c0992082a
2016-12-02 20:42:27 +00:00
Jeff Sharkey
5a9af6c6ab 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
am: 8a97e90f9c  -s ours

Change-Id: I9ea2fd7893f1db835a2df49c33dbf2b005250a4f
2016-12-02 20:42:22 +00:00
Jeff Sharkey
a19e9fdebd 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
am: 3ef390afb2  -s ours

Change-Id: I24872c24ea2231e1dff28dd1046602be192534a1
2016-12-02 20:40:41 +00:00
Jeff Sharkey
c3716ca85b 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
am: 50a914886c  -s ours

Change-Id: I78b446c25f26f75d617b8fce3acacfe7f6ba50cd
2016-12-02 20:40:36 +00:00
Jeff Sharkey
c8d3a24460 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
am: 2282ec207f  -s ours

Change-Id: I2df404050a6fb2be4a6e1cf168667f769efc26e5
2016-12-02 20:38:52 +00:00
Jeff Sharkey
6a0af2d16e 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
am: 5697bc0dfc  -s ours

Change-Id: I384d9d5b4fe12ca37fb036199c9fced77b2ea0f4
2016-12-02 20:38:45 +00:00
Jeff Sharkey
6fa7e324fe 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 am: f199d511c3 am: 1d752340a7 am: 4aacfce724
am: 5b64f51a1c

Change-Id: Ieb9e7636cf14afed49fd925299fc504505c1731f
2016-12-02 20:38:32 +00:00
Jeff Sharkey
ca76b0420a 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 am: 0eaa192436 am: 43b3a13803 am: 6786309c03
am: a43ee01a6d

Change-Id: I737ca593b673dae19b0b4a259ddf1583a687d5a5
2016-12-02 20:37:20 +00:00
Jeff Sharkey
89a01de548 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
am: 214b523a6a  -s ours

Change-Id: Ied75877c0a1e1bb73429d7b109a8bca684cdf3d8
2016-12-02 20:36:56 +00:00
Jeff Sharkey
ce9e5df31e 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
am: bfd33d0377  -s ours

Change-Id: Icf3b9cb0f5e25bb745660efff1ed092d4c37ed7a
2016-12-02 20:36:50 +00:00
Jeff Sharkey
65d1a92c92 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 am: 3fa188bd8f am: 09960bdfcc am: d12e48494d
am: 341813c852

Change-Id: I996957f442210076ee810d8a0eb8cc70a3a9be07
2016-12-02 20:36:00 +00:00
Jeff Sharkey
90055d575c 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 am: 836b54e6bb am: 383e0cfa06 am: a55258bd17
am: 2f48a6ce63

Change-Id: I4d17af1f12a727bd5b00167ccb19a045791f18a6
2016-12-02 20:35:08 +00:00
Jeff Sharkey
b32eb5131e 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
am: 0c7267b698  -s ours

Change-Id: Id7d6b94ee0c175697e5485c5cdc4354bdc23eb6b
2016-12-02 20:35:08 +00:00
Jeff Sharkey
c794493f2e 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
am: 3d83246be3  -s ours

Change-Id: Ia691ca2f22e62a2a3fa775eeaff1cb38e10178b4
2016-12-02 20:35:05 +00:00
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
5b64f51a1c 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 am: f199d511c3 am: 1d752340a7
am: 4aacfce724

Change-Id: I954a47982a94c14abeeee205015423b9d6c19cea
2016-12-02 20:20:39 +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
a43ee01a6d 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 am: 0eaa192436 am: 43b3a13803
am: 6786309c03

Change-Id: Ie17a80be06549016951ff91792586e1dc2e004cc
2016-12-02 20:19:28 +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