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

Jeff Sharkey [Fri, 2 Dec 2016 22:26:03 +0000 (22:26 +0000)]

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: 375f16eff4

Change-Id: Ia7400dc5280a87cfa687c0b84b124bdb8db6381d

commit | commitdiff | tree

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

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: 00cc40c40a

Change-Id: I194205a9ae60f187364590bbf32f42f246d3b912

commit | commitdiff | tree

Paul Stewart [Fri, 2 Dec 2016 22:23:29 +0000 (22:23 +0000)]

Merge changes from topic 'fast-bss-transition' into nyc-mr2-dev
am: 3eda32cc71

Change-Id: Iacbf01ae85184c019bb462a7cf55efa2bb4645d5

commit | commitdiff | tree

Paul Stewart [Fri, 2 Dec 2016 22:19:07 +0000 (22:19 +0000)]

Add capability flag for 802.11r fast BSS transition
am: fbb63b0923

Change-Id: I918b0cc6d4b7ab157eabe5a04ce4c04598e01966

commit | commitdiff | tree

Paul Stewart [Fri, 2 Dec 2016 22:18:25 +0000 (22:18 +0000)]

Add constants for 802.11r
am: 3ed7caa0f9

Change-Id: Iff6064efa02138a0458d31f630335c039b057145

commit | commitdiff | tree

Jakub Pawlowski [Fri, 2 Dec 2016 22:14:04 +0000 (22:14 +0000)]

Merge changes from topic 'ble_oob_sc_mr2' into nyc-mr2-dev
am: c977c776c2

Change-Id: Ic0efac1c5b2abace1e3075eb8b08f4c022a5414c

commit | commitdiff | tree

Jakub Pawlowski [Fri, 2 Dec 2016 22:12:36 +0000 (22:12 +0000)]

BLE OOB Pairing - parse address type (5/5)
am: 3e73713590

Change-Id: I12b662d43aedab8315d9273e55bfc4203bfc6272

commit | commitdiff | tree

Jakub Pawlowski [Fri, 2 Dec 2016 22:11:45 +0000 (22:11 +0000)]

Fix Bluetooth OOB pairing not working for unseen devices
am: 2d0ebcf3a0

Change-Id: Ifd76075e33e75c03e54aec99b0327e0c9a8f70e6

commit | commitdiff | tree

Jakub Pawlowski [Fri, 2 Dec 2016 22:10:53 +0000 (22:10 +0000)]

Add LE Secure Connection data parsing (1/4)
am: 8fcff25c4f -s ours

Change-Id: Ib9a253c5a4cd69e9eb3028e9c8477ac9acdc3105

commit | commitdiff | tree

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

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

commit | commitdiff | tree

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

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

commit | commitdiff | tree

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

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

commit | commitdiff | tree

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

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

commit | commitdiff | tree

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

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

commit | commitdiff | tree

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

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

commit | commitdiff | tree

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

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

commit | commitdiff | tree

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

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: Ia32a4880fc1c050122050099660d23322a51bbcc

commit | commitdiff | tree

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

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

commit | commitdiff | tree

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

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: Ie9f87cf495bc3ffbdba03dc2ee5f2933790883d0

commit | commitdiff | tree

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

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

commit | commitdiff | tree

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

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

commit | commitdiff | tree

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

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

Change-Id: I32c59ff8fd27596728ba87180cdf8e0c06d0d6ba

commit | commitdiff | tree

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

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

Change-Id: Idc5bde3158245925645d1ab69115df561922a758

commit | commitdiff | tree

TreeHugger Robot [Fri, 2 Dec 2016 20:14:09 +0000 (20:14 +0000)]

Merge changes from topic 'fast-bss-transition' into nyc-mr2-dev

* changes:
Add capability flag for 802.11r fast BSS transition
Add constants for 802.11r

commit | commitdiff | tree

Jakub Pawlowski [Fri, 2 Dec 2016 20:14:00 +0000 (20:14 +0000)]

Merge changes from topic 'ble_oob_sc_mr2' into nyc-mr2-dev

* changes:
  BLE OOB Pairing - parse address type (5/5)
  Fix Bluetooth OOB pairing not working for unseen devices
  Add LE Secure Connection data parsing (1/4)

commit | commitdiff | tree

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

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

Change-Id: Ie7b1d07a622a9b5be4e0d5d9b08b33b821b8e43a

commit | commitdiff | tree

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

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

Change-Id: I5f4f250100c3b9f63149add16f0086c77ccdf7ca

commit | commitdiff | tree

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

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

Change-Id: Ib66ff9a9e82f9ed3e7e291c0bcca1be9d4f38805

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 20:08:38 +0000 (20:08 +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" into cw-f-dev am: 2e73db5b9c
am: 1157adb305

Change-Id: Ibf843248b74237e380bd1c5c79999117b0b2efbd

commit | commitdiff | tree

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

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

Change-Id: I231c3a499177db213b0406ea84e7ea3c224f132d

commit | commitdiff | tree

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

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Dec 2016 20:01:46 +0000 (20:01 +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" into cw-f-dev am: 2e73db5b9c am: 0e673a8143" into nyc-mr2-dev-plus-aosp

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 20:01:07 +0000 (20:01 +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" into cw-f-dev am: 2e73db5b9c
am: 0e673a8143

Change-Id: Ia4b77f2c50c89ac555880acf28eea28f8bc355a3

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Dec 2016 20:00:38 +0000 (20:00 +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: 17d6ba41b8" into nyc-mr1-dev-plus-aosp am: a2a069e998" into nyc-mr2-dev-plus-aosp

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)]

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

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

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

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

Change-Id: I990a5459cd64bbc0e2ede2d3b5899163d12818f4

commit | commitdiff | tree

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

commit | commitdiff | tree

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

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

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

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

Change-Id: Ie0fe9fd6770c94d56b3af10902c44c52d9a2f2a3

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)]

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:09 +0000 (19:53 +0000)]

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

Change-Id: Ibae31cd6439c2fdfcc9d333ca23bd466a7730218

commit | commitdiff | tree

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

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)]

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

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

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

Change-Id: Ib546b18b5373aaf8e429a3e8668a23a9d3b5c411

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

Jeff Sharkey [Fri, 2 Dec 2016 19:51:21 +0000 (19:51 +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" into cw-f-dev
am: 2e73db5b9c

Change-Id: I0d230d279eb3fad10e46dbb3c469d770a80482e8

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:48:23 +0000 (19:48 +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" into cw-f-dev
am: 2e73db5b9c

Change-Id: I1af1fa92fbf8a46037d8622f04269590af5706b9

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)]

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:36 +0000 (19:46 +0000)]

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

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)]

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:33 +0000 (19:45 +0000)]

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

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)]

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:38 +0000 (19:44 +0000)]

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

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)]

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:33 +0000 (19:43 +0000)]

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

commit | commitdiff | tree

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

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

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

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:15 +0000 (19:29 +0000)]

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

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:18 +0000 (19:28 +0000)]

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

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