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

Roshan Pius [Sat, 3 Dec 2016 04:28:44 +0000 (04:28 +0000)]

Merge changes from topic 'fast-bss-transition' am: f301986727
am: 33aa9ce35d

Change-Id: I6297bf2393113fbe5a82d37b533f808e569b1c73

commit | commitdiff | tree

Paul Stewart [Sat, 3 Dec 2016 04:27:37 +0000 (04:27 +0000)]

Add capability flag for 802.11r fast BSS transition am: 07f4d23a88
am: 4120c55379

Change-Id: Ic024a7c89528ddce70d700ca5954fa934c2d3cd9

commit | commitdiff | tree

Paul Stewart [Sat, 3 Dec 2016 04:26:34 +0000 (04:26 +0000)]

Add constants for 802.11r am: e72f7dc385
am: 1fd6f643ac

Change-Id: I320327bfd79bccb206d0c462705364216b9465e0

commit | commitdiff | tree

Stephen Chen [Sat, 3 Dec 2016 04:23:49 +0000 (04:23 +0000)]

Merge "Add Settings.Global.WIFI_WAKEUP_ENABLED flag." am: d758ce1586
am: d738140b8d

Change-Id: Icb8eb81b2021ee12eccd9158974353120228e7c0

commit | commitdiff | tree

Colin Cross [Sat, 3 Dec 2016 04:22:44 +0000 (04:22 +0000)]

Merge "Convert libandroidfw to Android.bp" am: 46ec8dba83
am: 9625912b7f

Change-Id: I1f52bfd7e0dc8b5a543b41f8c4a3b7b2a35355c9

commit | commitdiff | tree

Roshan Pius [Sat, 3 Dec 2016 04:18:00 +0000 (04:18 +0000)]

Merge changes from topic 'fast-bss-transition'
am: f301986727

Change-Id: I0b0334f193120d379031d9790d68bc2840254391

commit | commitdiff | tree

Paul Stewart [Sat, 3 Dec 2016 04:17:49 +0000 (04:17 +0000)]

Add capability flag for 802.11r fast BSS transition
am: 07f4d23a88

Change-Id: Ife9a8e1342b6b090dec749cf505fd3091ff33f89

commit | commitdiff | tree

Paul Stewart [Sat, 3 Dec 2016 04:16:58 +0000 (04:16 +0000)]

Add constants for 802.11r
am: e72f7dc385

Change-Id: I06d93c3ce96cddd6447b340304ce9fec2d4e41f2

commit | commitdiff | tree

Stephen Chen [Sat, 3 Dec 2016 04:16:06 +0000 (04:16 +0000)]

Merge "Add Settings.Global.WIFI_WAKEUP_ENABLED flag."
am: d758ce1586

Change-Id: I1bf1effbb635d57980728555587e8056f630edb9

commit | commitdiff | tree

Colin Cross [Sat, 3 Dec 2016 04:14:58 +0000 (04:14 +0000)]

Merge "Convert libandroidfw to Android.bp"
am: 46ec8dba83

Change-Id: I32a737c491eeb95ad080adacd47602ee814ba0cb

commit | commitdiff | tree

Roshan Pius [Fri, 2 Dec 2016 23:57:39 +0000 (23:57 +0000)]

Merge changes from topic 'fast-bss-transition'

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

commit | commitdiff | tree

Treehugger Robot [Fri, 2 Dec 2016 23:41:36 +0000 (23:41 +0000)]

Merge "Add Settings.Global.WIFI_WAKEUP_ENABLED flag."

commit | commitdiff | tree

Treehugger Robot [Fri, 2 Dec 2016 23:16:48 +0000 (23:16 +0000)]

Merge "Convert libandroidfw to Android.bp"

commit | commitdiff | tree

Chris Tate [Fri, 2 Dec 2016 22:51:11 +0000 (22:51 +0000)]

Merge "Fix the deadlock problem" am: fa228e06f6
am: e8c0e1098e

Change-Id: Ibf2ad3736be9cbe4797c1678e3665be4a19d82ea

commit | commitdiff | tree

Chris Tate [Fri, 2 Dec 2016 22:45:47 +0000 (22:45 +0000)]

Merge "Fix the deadlock problem"
am: fa228e06f6

Change-Id: I862d3cedcf38c81f22559439aa8f00ac2ab3cca3

commit | commitdiff | tree

Chris Tate [Fri, 2 Dec 2016 22:39:57 +0000 (22:39 +0000)]

Merge "Fix the deadlock problem"

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

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

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

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

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

Android Build Merger (Role) [Fri, 2 Dec 2016 19:49:20 +0000 (19:49 +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" into nyc-mr1-dev-plus-aosp

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

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

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

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

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

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

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

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:27:23 +0000 (19:27 +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

Change-Id: I66fdc5fb2ca169453b6b2f5dc7d6c10360aea709

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

DO NOT MERGE. Check provider access for content changes. am: 91add43ae7 am: 792d49dfb5 -s ours am: 32af84320b am: 8b5fa0c0c0
am: d081cb0ab7

Change-Id: I3fc3458a9050e1ee9cb57b9348d67ccd3ce71037

commit | commitdiff | tree

Colin Cross [Thu, 1 Dec 2016 23:55:00 +0000 (15:55 -0800)]

Convert libandroidfw to Android.bp

See build/soong/README.md for more information.

Test: libandroidfw_tests
Merged-In: I4e575d62f724d5ffe43f12ff5642fb6799f7819e
Change-Id: I4e575d62f724d5ffe43f12ff5642fb6799f7819e
(cherry picked from commit 4f8d9e69eb63878a99abedfdc7b92c6284f30605)

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

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

Jeff Sharkey [Fri, 2 Dec 2016 19:13:31 +0000 (19:13 +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

Change-Id: I0ff63a0da9300799a8df538fcefaf0d27ea2be00

commit | commitdiff | tree

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

DO NOT MERGE. Check provider access for content changes. am: 9b85862620 -s ours am: 9277cce7fa am: a1d1ecbe05 -s ours am: 928c09cd8e
am: 5267b63325

Change-Id: I3cab573840604be9c44e85998c4b1a579d07aee4

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:12:00 +0000 (19:12 +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

Change-Id: I1812de0dd036142fae97145361fdf5da50e61536

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:11:29 +0000 (19:11 +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

Change-Id: I15e9c5f864ec67c8bf5901fcc46abe0c7b362a6e

commit | commitdiff | tree

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

DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a -s ours
am: c067e76bba

Change-Id: I36e17906c43408126d1acabde89bf7ec04e16aab

commit | commitdiff | tree

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

DO NOT MERGE. Check provider access for content changes. am: 91add43ae7 am: 792d49dfb5 -s ours am: 32af84320b
am: 8b5fa0c0c0

Change-Id: Ie5bb120bcd900c2032e47f0ae3e1c710c083ae2e

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:04:02 +0000 (19:04 +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

Change-Id: I18a8e1de1557e15c289974240419abc59147facd

commit | commitdiff | tree

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

Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b
am: 26f78f5836 -s ours

Change-Id: I6521af4ca816ed3b03e6954159276971a55d349c

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 19:03:36 +0000 (19:03 +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

Change-Id: I886018e68c75bb833d0a18c76f6db557b1b9c9e8

commit | commitdiff | tree

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

DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0
am: 4ad177829a -s ours

Change-Id: I946f7bab2f86d26c23460cc5664d901f4f8fff06

commit | commitdiff | tree

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

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

Change-Id: Ifbfd912aac170923e5aea43e3b5ba9cfe135cea5

commit | commitdiff | tree

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

DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours am: 3f0e7465cb am: b88d8dc58f am: b4638e2d88
am: bf9a60106b

Change-Id: I8c9cb10bfc49c49fe51512dbc9242c94820d474e

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:56:56 +0000 (18:56 +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

Change-Id: I4f117247986cfa72156d26af917ba1bae6e9fa9b

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:56:01 +0000 (18:56 +0000)]

DO NOT MERGE. Check provider access for content changes. am: 9b85862620 -s ours am: 9277cce7fa am: a1d1ecbe05 -s ours
am: 928c09cd8e

Change-Id: Ic470197dcc815e7ecf6b47dfd74ff6f4f74f1804

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:55:14 +0000 (18:55 +0000)]

Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d am: 414334595e am: 26e6918800
am: ef5d241938

Change-Id: I87f7ada782341c052d923fcd0798f58adc1942e2

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:55:07 +0000 (18:55 +0000)]

Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am: 6b89229d14 am: a7efe16fe1 -s ours
am: f1085f2dc8

Change-Id: I565994dc5bbfc11b3293cb77aabca77b908a9039

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:55:04 +0000 (18:55 +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

Change-Id: Ibe93903e3be3f8a6581fc0a3acdc6482542f3204

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:54:57 +0000 (18:54 +0000)]

Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2
am: 44e8914f8b

Change-Id: I81d83d40d322bd6cfa2a6b74286cdfa425a2f951

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:53:58 +0000 (18:53 +0000)]

DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5
am: 74b36307a0

Change-Id: I6e5a7fbc4dfe0f207f6787ef5fbba93b0296e1b1

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:53:58 +0000 (18:53 +0000)]

DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours am: 3f0e7465cb am: b88d8dc58f
am: b4638e2d88

Change-Id: Iefbb713e624ec639205d51f560045a0cb5cf3dbc

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:53:57 +0000 (18:53 +0000)]

DO NOT MERGE. Check provider access for content changes. am: 91add43ae7 am: 792d49dfb5 -s ours
am: 32af84320b

Change-Id: I73fe93944c2c2aebca02ca85d441905c2075bc65

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:53:57 +0000 (18:53 +0000)]

DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 am: bdfb26ac3b am: ad04786a3d
am: 9e7bd59457

Change-Id: Ia76c61296501cede3473ac743583643135820ad4

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:47:08 +0000 (18:47 +0000)]

Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04
am: 4610805746 -s ours

Change-Id: If9504039b5ec449edb2fb1e9f429a3d568a2aabf

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:46:35 +0000 (18:46 +0000)]

Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev am: 0be332852e -s ours am: b685f719f1
am: 45b6a52225

Change-Id: Ie06f966f3b526c56de139a81edc7d8ccd5be074c

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:46:35 +0000 (18:46 +0000)]

Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d am: 414334595e
am: 26e6918800

Change-Id: I8b1bf2889bface1c6d8aad7c92b55c301059d6f5

commit | commitdiff | tree

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

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

Change-Id: I9d320f3e2c77712757c17f1609c62c325cca9082

commit | commitdiff | tree

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

DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 am: bdfb26ac3b
am: ad04786a3d

Change-Id: I7272c2bab70ff8b6efd44c35f0131e57f6603748

commit | commitdiff | tree

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

DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours am: 3f0e7465cb
am: b88d8dc58f

Change-Id: I9587d5abd8d0525e3b098a5f9662e5edbc1f9c12

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:40:25 +0000 (18:40 +0000)]

Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am: ae7d4b1339 -s ours am: ce477912a2
am: 920b02a94f -s ours

Change-Id: I3c2b9ba49785b40df3960fac4ffb17204cab063a

commit | commitdiff | tree

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

DO NOT MERGE. Check provider access for content changes. am: 9b85862620 -s ours am: 9277cce7fa
am: a1d1ecbe05 -s ours

Change-Id: I6d4f8a29537e19545bf94a886aecea8ba05a6de7

commit | commitdiff | tree

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

Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev am: 0be332852e -s ours
am: b685f719f1

Change-Id: If5744f0e5554877450b5e75f304fe857366de72c

commit | commitdiff | tree

Jeff Sharkey [Fri, 2 Dec 2016 18:38:01 +0000 (18:38 +0000)]

Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am: 6b89229d14
am: a7efe16fe1 -s ours

Change-Id: I17b84f1e8d8432292568c0adb2b3d89563a72b50

commit | commitdiff | tree

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

Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4
am: 471812ad04

Change-Id: Ida67c1a00ac95109c647eb182af7628544bbb739

commit | commitdiff | tree

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

Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209
am: a80cbeeee2

Change-Id: I6b67d2f65208559d9cb5cd79bfec5fbc506abcad