git.osdn.net Git - android-x86/frameworks-base.git/log

OSDN Git Service

(root) / android-x86 / frameworks-base.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 20:42:22 +0000 (20:42 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 20:40:41 +0000 (20:40 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 20:40:36 +0000 (20:40 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 20:38:52 +0000 (20:38 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 20:38:45 +0000 (20:38 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 20:36:56 +0000 (20:36 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 20:36:50 +0000 (20:36 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 20:35:08 +0000 (20:35 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 20:35:05 +0000 (20:35 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 20:33:32 +0000 (20:33 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 20:33:27 +0000 (20:33 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 20:32:02 +0000 (20:32 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 20:31:56 +0000 (20:31 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 20:30:17 +0000 (20:30 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 20:30:11 +0000 (20:30 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 20:28:26 +0000 (20:28 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 20:28:22 +0000 (20:28 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 20:27:07 +0000 (20:27 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 20:27:03 +0000 (20:27 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 20:25:37 +0000 (20:25 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 20:25:31 +0000 (20:25 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 20:24:01 +0000 (20:24 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 20:23:54 +0000 (20:23 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 20:22:18 +0000 (20:22 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 20:22:12 +0000 (20:22 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 20:20:36 +0000 (20:20 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 20:20:30 +0000 (20:20 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 20:18:50 +0000 (20:18 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 20:18:44 +0000 (20:18 +0000)]

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

commit | commitdiff | tree

Jaekyun Seok [Fri, 2 Dec 2016 20:17:37 +0000 (20:17 +0000)]

Merge "Remove static link in Android framework under /frameworks/base." am: c60963e451 am: 5705ad69db am: ae21f6f5b0
am: 195caa6696 -s ours

Change-Id: If30455d6043d7e63e48bf2773198bd80f2524937

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Dec 2016 20:00:16 +0000 (20:00 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:59:42 +0000 (19:59 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:59:38 +0000 (19:59 +0000)]

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Dec 2016 19:59:14 +0000 (19:59 +0000)]

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Dec 2016 19:58:56 +0000 (19:58 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:58:20 +0000 (19:58 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:58:12 +0000 (19:58 +0000)]

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Dec 2016 19:57:34 +0000 (19:57 +0000)]

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Dec 2016 19:57:17 +0000 (19:57 +0000)]

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Dec 2016 19:57:14 +0000 (19:57 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:56:42 +0000 (19:56 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:56:37 +0000 (19:56 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:56:32 +0000 (19:56 +0000)]

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Dec 2016 19:56:04 +0000 (19:56 +0000)]

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Dec 2016 19:55:49 +0000 (19:55 +0000)]

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

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Dec 2016 19:55:50 +0000 (19:55 +0000)]

Merge "Allow some app windows to display above the IME."

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Dec 2016 19:55:28 +0000 (19:55 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:55:29 +0000 (19:55 +0000)]

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Dec 2016 19:54:58 +0000 (19:54 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:54:49 +0000 (19:54 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:54:38 +0000 (19:54 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:54:22 +0000 (19:54 +0000)]

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Dec 2016 19:53:59 +0000 (19:53 +0000)]

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Dec 2016 19:53:50 +0000 (19:53 +0000)]

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Dec 2016 19:53:40 +0000 (19:53 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:53:13 +0000 (19:53 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:53:00 +0000 (19:53 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:52:56 +0000 (19:52 +0000)]

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Dec 2016 19:52:48 +0000 (19:52 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:52:06 +0000 (19:52 +0000)]

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

commit | commitdiff | tree

Jaekyun Seok [Fri, 2 Dec 2016 19:51:59 +0000 (19:51 +0000)]

Merge "Remove static link in Android framework under /frameworks/base." am: c60963e451 am: 5705ad69db
am: ae21f6f5b0

Change-Id: Ie0306a1e3dc80f6ee6ad9669b91d150167b04586

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Dec 2016 19:49:00 +0000 (19:49 +0000)]

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

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Dec 2016 19:48:55 +0000 (19:48 +0000)]

Merge "Allow only U+0020..U+007E characters for axis tag."

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:48:08 +0000 (19:48 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:47:38 +0000 (19:47 +0000)]

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Dec 2016 19:47:25 +0000 (19:47 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:46:49 +0000 (19:46 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:46:22 +0000 (19:46 +0000)]

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Dec 2016 19:46:17 +0000 (19:46 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:45:36 +0000 (19:45 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:45:19 +0000 (19:45 +0000)]

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Dec 2016 19:45:14 +0000 (19:45 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:44:41 +0000 (19:44 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:44:25 +0000 (19:44 +0000)]

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Dec 2016 19:44:20 +0000 (19:44 +0000)]

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

commit | commitdiff | tree

Jaekyun Seok [Fri, 2 Dec 2016 19:43:36 +0000 (19:43 +0000)]

Merge "Remove static link in Android framework under /frameworks/base." am: c60963e451
am: 5705ad69db

Change-Id: I3f2c38332115a7b52b893629f2a5007d75c2831d

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:43:34 +0000 (19:43 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:43:28 +0000 (19:43 +0000)]

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

commit | commitdiff | tree

Fyodor Kupolov [Fri, 2 Dec 2016 19:36:24 +0000 (19:36 +0000)]

Merge "Added get-privapp-permissions command"

commit | commitdiff | tree

Jaekyun Seok [Fri, 2 Dec 2016 19:35:03 +0000 (19:35 +0000)]

Merge "Remove static link in Android framework under /frameworks/base."
am: c60963e451

Change-Id: I0bbb3cf9a66752f6ee8218a4ac5545091130bbed

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:32:36 +0000 (19:32 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:29:14 +0000 (19:29 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:28:14 +0000 (19:28 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:27:26 +0000 (19:27 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:26:31 +0000 (19:26 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:23:59 +0000 (19:23 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:22:55 +0000 (19:22 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:21:57 +0000 (19:21 +0000)]

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

commit | commitdiff | tree

Treehugger Robot [Fri, 2 Dec 2016 19:21:46 +0000 (19:21 +0000)]

Merge "Remove static link in Android framework under /frameworks/base."

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:21:21 +0000 (19:21 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:20:23 +0000 (19:20 +0000)]

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Dec 2016 19:19:29 +0000 (19:19 +0000)]

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"

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:19:29 +0000 (19:19 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:19:00 +0000 (19:19 +0000)]

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Dec 2016 19:18:44 +0000 (19:18 +0000)]

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"

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:18:31 +0000 (19:18 +0000)]

DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb
am: 8165a22f53

Change-Id: Iee87f3c3d384bf785b3c6c877a817c35bbdb478b

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Dec 2016 19:18:28 +0000 (19:18 +0000)]

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"

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:17:42 +0000 (19:17 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:17:37 +0000 (19:17 +0000)]

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Dec 2016 19:17:11 +0000 (19:17 +0000)]

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"

frameworks/base

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.