OSDN Git Service
Jason Monk [Tue, 6 Dec 2016 16:43:38 +0000 (16:43 +0000)]
resolve merge conflicts of
9600df0 to stage-aosp-master
am:
f120cf3d88
Change-Id: Id2c5d4905fed661466929ed93e08e7b079c8c51d
Jason Monk [Tue, 6 Dec 2016 16:34:12 +0000 (11:34 -0500)]
resolve merge conflicts of
9600df0 to stage-aosp-master
Change-Id: I139c64bb2440d64312d7e763e53bdb13dcb9f1aa
Yifan Hong [Tue, 6 Dec 2016 15:45:33 +0000 (15:45 +0000)]
Merge "Check for nullptr when casting IBinder to IBase." am:
5014028691
am:
1abe6def68
Change-Id: I532e548c9558dada977ca1926ef4b7e39215924f
Yifan Hong [Tue, 6 Dec 2016 15:39:02 +0000 (15:39 +0000)]
Merge "Check for nullptr when casting IBinder to IBase."
am:
5014028691
Change-Id: I4a3c320351a9afa305a40e3912cc2e968494497c
Jason Monk [Tue, 6 Dec 2016 15:11:18 +0000 (15:11 +0000)]
Merge "Fix Hotspot tile is shown on Guest user"
Treehugger Robot [Tue, 6 Dec 2016 15:08:39 +0000 (15:08 +0000)]
Merge "Check for nullptr when casting IBinder to IBase."
Ned Burns [Tue, 6 Dec 2016 02:33:42 +0000 (02:33 +0000)]
Merge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev
am:
3601d3c239
Change-Id: I06edeb142fe780a80e679d08c0c8bf463737277b
Ned Burns [Tue, 6 Dec 2016 02:33:23 +0000 (02:33 +0000)]
Modify SwipeDismissLayout to perform its own exit animation
am:
7d6cb913de
Change-Id: Ie9784fa9b7c878371f1e12acbb362b36fc66e023
Ned Burns [Tue, 6 Dec 2016 02:26:40 +0000 (02:26 +0000)]
Merge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev
Michael Kwan [Tue, 6 Dec 2016 02:11:46 +0000 (02:11 +0000)]
Merge "Revert "Change activity dismiss animation to move left to right."" into cw-f-dev
am:
7f2554cfb7
Change-Id: I5a0046872debed1da0ed614a9237279cc74e4ace
Michael Kwan [Tue, 6 Dec 2016 02:11:40 +0000 (02:11 +0000)]
Revert "Change activity dismiss animation to move left to right."
am:
ac9443ef9c
Change-Id: Id496825676eb4a8dff75b7c3fe6b5b8df2309465
Elliot Waite [Tue, 6 Dec 2016 02:06:25 +0000 (02:06 +0000)]
Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev am:
050cf854c7
am:
5a701867d5
Change-Id: I2fad5b6fcd04c881ffacf8911d6c179d3af6f72a
Elliot Waite [Tue, 6 Dec 2016 02:05:08 +0000 (02:05 +0000)]
Change insecure HTTP resource link to scheme-relative link. am:
fc175c08cb
am:
c67ea5e3ff
Change-Id: Ia69b611a90b4c72e1cc9aa846ed12e0af685a0f4
TreeHugger Robot [Tue, 6 Dec 2016 02:04:26 +0000 (02:04 +0000)]
Merge "Revert "Change activity dismiss animation to move left to right."" into cw-f-dev
Elliot Waite [Tue, 6 Dec 2016 01:59:16 +0000 (01:59 +0000)]
Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev
am:
050cf854c7
Change-Id: Ibf58c209a59a7e9dc64976bafb5f4f9bfaa9a840
Elliot Waite [Tue, 6 Dec 2016 01:59:12 +0000 (01:59 +0000)]
Change insecure HTTP resource link to scheme-relative link.
am:
fc175c08cb
Change-Id: Ib5501d311ed6ee620d81b8399334097ea4c432a2
Elliot Waite [Tue, 6 Dec 2016 01:52:08 +0000 (01:52 +0000)]
Merge "Change insecure HTTP resource link to scheme-relative link." into nyc-mr1-dev
Ned Burns [Fri, 2 Dec 2016 22:25:33 +0000 (17:25 -0500)]
Modify SwipeDismissLayout to perform its own exit animation
Instead of relying on the window animation system, in the special
case of a swipe-dismiss, disable any default window exit animation
and perform a custom animation. This bypasses some bugs in the
window animator codebase and allows us to have a nice "rebound"
animation if the user doesn't swipe far/fast enough to trigger a
dismiss.
Bug:
33041168
Change-Id: Ied45700d35a59950bacef1ba0650eaa5bc60fadb
Jeff Sharkey [Tue, 6 Dec 2016 00:29:38 +0000 (00:29 +0000)]
Merge "Initial Binder interface for installd." am:
19fc36fa33
am:
2ab7bff525
Change-Id: I80f56bc8e531fd23ffc95f2f75c84add3f9a34e5
Jeff Sharkey [Tue, 6 Dec 2016 00:23:56 +0000 (00:23 +0000)]
Merge "Initial Binder interface for installd."
am:
19fc36fa33
Change-Id: I22e910b705327eafa5c158ec43d6d86eb0b429d0
Jeff Sharkey [Tue, 6 Dec 2016 00:14:53 +0000 (00:14 +0000)]
Merge "Initial Binder interface for installd."
Yifan Hong [Mon, 5 Dec 2016 21:10:13 +0000 (13:10 -0800)]
Check for nullptr when casting IBinder to IBase.
Test: compiles
Bug:
33307202
Change-Id: I6ef880188e2f43766e52317244366b2fdd38c728
TreeHugger Robot [Mon, 5 Dec 2016 20:44:56 +0000 (20:44 +0000)]
Merge "Move dump() to dumpAsync(), more oneway calls." into nyc-mr1-dev-plus-aosp
Jeff Sharkey [Mon, 5 Dec 2016 18:19:28 +0000 (11:19 -0700)]
Initial Binder interface for installd.
Start using new installd Binder interface, with a quick-disable
switch if something breaks.
Test: builds, boots
Bug:
13758960,
30944031
Change-Id: Ia6e55d49595c96ae928aefc8a6606ee690e58764
Michael Kwan [Mon, 5 Dec 2016 18:09:10 +0000 (18:09 +0000)]
Disable swipe-to-dismiss for not cancelable dialogs.
am:
f7964be938
Change-Id: I6d71bb4c6acdc9d994766eebd7a6320356aa3a23
Etan Cohen [Mon, 5 Dec 2016 16:03:44 +0000 (16:03 +0000)]
Merge "[AWARE] Fix javadocs for match filter update" am:
7241d28826
am:
65617f21bf
Change-Id: I8428c743bf607a096674aa84cb8eda1929b55d84
Etan Cohen [Mon, 5 Dec 2016 15:57:37 +0000 (15:57 +0000)]
Merge "[AWARE] Fix javadocs for match filter update"
am:
7241d28826
Change-Id: I67b2798b0eb1bc7e4ccd727aad9e761da49a8823
Etan Cohen [Mon, 5 Dec 2016 15:51:17 +0000 (15:51 +0000)]
Merge "[AWARE] Fix javadocs for match filter update"
ltrochtova [Mon, 5 Dec 2016 15:51:10 +0000 (15:51 +0000)]
Merge "Introduce a new user restriction for disallowing Bluetooth." am:
5fb37a7641 -s ours
am:
8058dc0e82 -s ours
Change-Id: I1d84e927e8cd05c51285fba9226b1bd9f2c1c12a
ltrochtova [Mon, 5 Dec 2016 15:44:06 +0000 (15:44 +0000)]
Merge "Introduce a new user restriction for disallowing Bluetooth."
am:
5fb37a7641 -s ours
Change-Id: Ib4a1173b40701562fc41738319371e126eba6c04
Lenka Trochtova [Mon, 5 Dec 2016 15:37:34 +0000 (15:37 +0000)]
Introduce a new user restriction for disallowing Bluetooth.
am:
13a0519394
Change-Id: I3d875e1a7baf69022d58902689fa9370bcb44dc6
ltrochtova [Mon, 5 Dec 2016 15:35:21 +0000 (15:35 +0000)]
Merge "Introduce a new user restriction for disallowing Bluetooth."
Lenka Trochtova [Fri, 2 Dec 2016 11:19:39 +0000 (12:19 +0100)]
Introduce a new user restriction for disallowing Bluetooth.
Only the device owner will be able to set the restriction
and the restriction will prevent usage of Bluetooth on the
entire device - i.e. in all the users.
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.UserRestrictionsTest
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.DeviceOwnerTest#testBluetoothRestriction
Bug:
32895300
Merged-In: I2875cf178cb16eca1965d0ba965d1cd3d8db2ad5
Change-Id: I2875cf178cb16eca1965d0ba965d1cd3d8db2ad5
Lenka Trochtova [Fri, 2 Dec 2016 11:19:39 +0000 (12:19 +0100)]
Introduce a new user restriction for disallowing Bluetooth.
Only the device owner will be able to set the restriction
and the restriction will prevent usage of Bluetooth on the
entire device - i.e. in all the users.
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.UserRestrictionsTest
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.DeviceOwnerTest#testBluetoothRestriction
Bug:
32895300
Merged-In: I2875cf178cb16eca1965d0ba965d1cd3d8db2ad5
Change-Id: I2875cf178cb16eca1965d0ba965d1cd3d8db2ad5
Tobias Thierer [Mon, 5 Dec 2016 09:39:55 +0000 (09:39 +0000)]
Merge "Migrate StrictJarVerifier and ShortcutPackageInfo to java.util.Base64" am:
1e498a96c1
am:
6e2d3fa82f
Change-Id: I925b0ca87bbd0f3be3f03865f70cafaaa1ef25ba
Tobias Thierer [Mon, 5 Dec 2016 09:35:10 +0000 (09:35 +0000)]
Merge "Migrate StrictJarVerifier and ShortcutPackageInfo to java.util.Base64"
am:
1e498a96c1
Change-Id: I28b8deadc9386b8772bd94870809213fdddad7e6
Tobias Thierer [Mon, 5 Dec 2016 09:28:46 +0000 (09:28 +0000)]
Merge "Migrate StrictJarVerifier and ShortcutPackageInfo to java.util.Base64"
Sungsoo Lim [Mon, 5 Dec 2016 04:47:33 +0000 (04:47 +0000)]
Merge "ExifInterface: fix NegativeArraySizeException" am:
c57b472d67
am:
582e612fdc
Change-Id: I671ef98f05431e7c4baa2a7b84f6cb04a82c5d9d
Sungsoo Lim [Mon, 5 Dec 2016 04:41:30 +0000 (04:41 +0000)]
Merge "ExifInterface: fix NegativeArraySizeException"
am:
c57b472d67
Change-Id: Ifbe9af9b62837923e6e56159759da6c59795b3aa
Sungsoo Lim [Mon, 5 Dec 2016 04:35:17 +0000 (04:35 +0000)]
Merge "ExifInterface: fix NegativeArraySizeException"
Yifan Hong [Sat, 3 Dec 2016 23:15:52 +0000 (23:15 +0000)]
Merge "Use IBase instead of IBinder for IServiceManager." am:
8ead2f0c9a
am:
dab9e7bfc7
Change-Id: I8c39d01e0670d200c18ba02dbd3d09cea5a503c7
Yifan Hong [Sat, 3 Dec 2016 23:10:08 +0000 (23:10 +0000)]
Merge "Use IBase instead of IBinder for IServiceManager."
am:
8ead2f0c9a
Change-Id: Ia18426c336f1ba9c9bceb57db0222ba6c59667a9
Treehugger Robot [Sat, 3 Dec 2016 23:04:24 +0000 (23:04 +0000)]
Merge "Use IBase instead of IBinder for IServiceManager."
Michael Kwan [Sat, 3 Dec 2016 19:33:27 +0000 (11:33 -0800)]
Revert "Change activity dismiss animation to move left to right."
This reverts commit
6d969ea4d86918ce8e2e3fb6618527c55f0c05da.
Change-Id: I39ab1bc00d20b6a719ac0930e5596e14fd8345b7
Sergey Yakovlev [Sat, 3 Dec 2016 04:30:42 +0000 (04:30 +0000)]
Merge "Update Samsung Print Recommendation Plugin (to support Mopria printers)" am:
41f14f47a5
am:
3a1cf2281b
Change-Id: Id94c02dc6106b5eb15274926ecd24e43c0ffc76f
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
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
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
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
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
Sergey Yakovlev [Sat, 3 Dec 2016 04:19:44 +0000 (04:19 +0000)]
Merge "Update Samsung Print Recommendation Plugin (to support Mopria printers)"
am:
41f14f47a5
Change-Id: I476bab68c662809bd998f0334441fdd31f6c940a
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
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
Paul Stewart [Sat, 3 Dec 2016 04:16:58 +0000 (04:16 +0000)]
Add constants for 802.11r
am:
e72f7dc385
Change-Id: I06d93c3ce96cddd6447b340304ce9fec2d4e41f2
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
Colin Cross [Sat, 3 Dec 2016 04:14:58 +0000 (04:14 +0000)]
Merge "Convert libandroidfw to Android.bp"
am:
46ec8dba83
Change-Id: I32a737c491eeb95ad080adacd47602ee814ba0cb
Treehugger Robot [Sat, 3 Dec 2016 03:53:17 +0000 (03:53 +0000)]
Merge "Update Samsung Print Recommendation Plugin (to support Mopria printers)"
Michael Kwan [Thu, 1 Dec 2016 00:44:33 +0000 (16:44 -0800)]
Disable swipe-to-dismiss for not cancelable dialogs.
Bug:
33249829
Change-Id: Ib3d2c9982ece22d1b080b821eaf306f6b686d099
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
Treehugger Robot [Fri, 2 Dec 2016 23:41:36 +0000 (23:41 +0000)]
Merge "Add Settings.Global.WIFI_WAKEUP_ENABLED flag."
Jeff Sharkey [Wed, 9 Nov 2016 19:25:44 +0000 (12:25 -0700)]
Move dump() to dumpAsync(), more oneway calls.
When calling out to dump services hosted by external apps, use
dumpAsync() to avoid hanging if the remote process is wedged.
Test: builds, boots, runs with minimal logs triggered
Bug:
32715088
Change-Id: I70aa2666ae21dae8f09ded2063bed359c0b210c5
Treehugger Robot [Fri, 2 Dec 2016 23:16:48 +0000 (23:16 +0000)]
Merge "Convert libandroidfw to Android.bp"
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
Chris Tate [Fri, 2 Dec 2016 22:45:47 +0000 (22:45 +0000)]
Merge "Fix the deadlock problem"
am:
fa228e06f6
Change-Id: I862d3cedcf38c81f22559439aa8f00ac2ab3cca3
Chris Tate [Fri, 2 Dec 2016 22:39:57 +0000 (22:39 +0000)]
Merge "Fix the deadlock problem"
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Android Build Merger (Role) [Fri, 2 Dec 2016 19:33:09 +0000 (19:33 +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