OSDN Git Service
Jason Monk [Wed, 22 Jun 2016 15:58:22 +0000 (15:58 +0000)]
Merge \\"QS: Fix default icon handling for services\\" into nyc-dev am:
94a20367b5
am:
be7b7690e5
Change-Id: Ied28b48ee5117e9fcf323701df6a294e76b9decb
Sid Soundararajan [Wed, 22 Jun 2016 15:58:16 +0000 (15:58 +0000)]
Merge \\"Blacklist ATV Remote Service to never appear on Recents\\" into nyc-dev am:
8f41c074c7
am:
295322d954
Change-Id: Id6b5c1d7fd40d57ba6c020844c582d069f7d6631
Jason Monk [Wed, 22 Jun 2016 15:44:06 +0000 (15:44 +0000)]
Merge \"QS: Fix default icon handling for services\" into nyc-dev
am:
94a20367b5
Change-Id: I20510a1397c304695596e4e8315d3cb428d26a74
Sid Soundararajan [Wed, 22 Jun 2016 15:44:02 +0000 (15:44 +0000)]
Merge \"Blacklist ATV Remote Service to never appear on Recents\" into nyc-dev
am:
8f41c074c7
Change-Id: I0191a58f0777732bc879cabbe2808c76381e18c8
Jason Monk [Wed, 22 Jun 2016 15:39:29 +0000 (15:39 +0000)]
Merge "QS: Fix default icon handling for services" into nyc-dev
TreeHugger Robot [Wed, 22 Jun 2016 15:36:09 +0000 (15:36 +0000)]
Merge "Blacklist ATV Remote Service to never appear on Recents" into nyc-dev
Jason Monk [Wed, 22 Jun 2016 13:58:46 +0000 (09:58 -0400)]
QS: Fix default icon handling for services
Change-Id: I3b25df8b8d02cd99a943571de14cf0a8c5b051bd
Fixes:
29452288
Android Build Merger (Role) [Wed, 22 Jun 2016 13:37:17 +0000 (13:37 +0000)]
Merge "Merge \\"Restrict hotspot qs tile to admin user\\" into nyc-dev am:
ba568a46e6 am:
60075864d8" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 22 Jun 2016 13:37:13 +0000 (13:37 +0000)]
Merge "Merge \\"Restrict hotspot qs tile to admin user\\" into nyc-dev am:
ba568a46e6 am:
045fd29c75" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 22 Jun 2016 13:37:05 +0000 (13:37 +0000)]
Merge "Merge \\"QS Edit: Try to simplify drag logic\\" into nyc-dev am:
3a0241566b am:
9bbaa8205e" into nyc-mr1-dev-plus-aosp
Jason Monk [Wed, 22 Jun 2016 13:36:30 +0000 (13:36 +0000)]
Merge \\"Restrict hotspot qs tile to admin user\\" into nyc-dev am:
ba568a46e6
am:
045fd29c75
Change-Id: Icc279d78fcecaad50c680000aa105f8ac8c48e3d
Jason Monk [Wed, 22 Jun 2016 13:36:26 +0000 (13:36 +0000)]
Merge \\"Restrict hotspot qs tile to admin user\\" into nyc-dev am:
ba568a46e6
am:
60075864d8
Change-Id: I9ce47a9ad82f124af60e12d7f9c279150d4e5cdf
Jason Monk [Wed, 22 Jun 2016 13:36:26 +0000 (13:36 +0000)]
Merge \\"QS Edit: Try to simplify drag logic\\" into nyc-dev am:
3a0241566b
am:
aeba74427f
Change-Id: Id1d065dfff30bfad173ef675d69b3dca835da47a
Jason Monk [Wed, 22 Jun 2016 13:36:23 +0000 (13:36 +0000)]
Merge \\"QS Edit: Try to simplify drag logic\\" into nyc-dev am:
3a0241566b
am:
9bbaa8205e
Change-Id: Ia5e43fcdab397ae1abb99ed7e6fdf30a24208740
Yoshinori Hirano [Wed, 22 Jun 2016 13:30:09 +0000 (13:30 +0000)]
Merge \"Restrict hotspot qs tile to admin user\" into nyc-dev
am:
ba568a46e6
Change-Id: Ifb7a835ab6633a97a5be32f8b6a699d0c75dde9a
Yoshinori Hirano [Wed, 22 Jun 2016 13:30:08 +0000 (13:30 +0000)]
Merge \"Restrict hotspot qs tile to admin user\" into nyc-dev
am:
ba568a46e6
Change-Id: I4b13eb4c37ae5b21bde74bbf55e77f51fb8ae238
Jason Monk [Wed, 22 Jun 2016 13:30:06 +0000 (13:30 +0000)]
Merge \"QS Edit: Try to simplify drag logic\" into nyc-dev
am:
3a0241566b
Change-Id: I9b080743a60d247c63293274759cbca313d7ca05
Jason Monk [Wed, 22 Jun 2016 13:30:04 +0000 (13:30 +0000)]
Merge \"QS Edit: Try to simplify drag logic\" into nyc-dev
am:
3a0241566b
Change-Id: Iadeeb7937feed24f8b591aac36da3d90a7a1e4d2
Jason Monk [Wed, 22 Jun 2016 13:23:25 +0000 (13:23 +0000)]
Merge "Restrict hotspot qs tile to admin user" into nyc-dev
Jason Monk [Wed, 22 Jun 2016 13:23:16 +0000 (13:23 +0000)]
Merge "QS Edit: Try to simplify drag logic" into nyc-dev
Android Build Merger (Role) [Wed, 22 Jun 2016 12:37:24 +0000 (12:37 +0000)]
Merge "Merge \\"Don\\'t allow showing an activity if user is stopping or shutting down.\\" into nyc-dev am:
2058553b8d am:
f5cf319dc9" into nyc-mr1-dev-plus-aosp
Nicolas Prévot [Wed, 22 Jun 2016 12:36:54 +0000 (12:36 +0000)]
Merge \\"Don\\'t allow showing an activity if user is stopping or shutting down.\\" into nyc-dev am:
2058553b8d
am:
f5cf319dc9
Change-Id: I65ee6db43e3ea7df99bac0edb81a034fc6318984
Nicolas Prévot [Wed, 22 Jun 2016 12:36:45 +0000 (12:36 +0000)]
Merge \\"Don\\'t allow showing an activity if user is stopping or shutting down.\\" into nyc-dev am:
2058553b8d
am:
ea600f9a12
Change-Id: I1b43aabc35b45558c90750cab7314b63ae8d4b60
Nicolas Prevot [Wed, 22 Jun 2016 12:33:43 +0000 (12:33 +0000)]
Merge \"Don\'t allow showing an activity if user is stopping or shutting down.\" into nyc-dev
am:
2058553b8d
Change-Id: I5f7cdfb398f74cd0c0ed172a001094e438190e6d
Nicolas Prevot [Wed, 22 Jun 2016 12:33:41 +0000 (12:33 +0000)]
Merge \"Don\'t allow showing an activity if user is stopping or shutting down.\" into nyc-dev
am:
2058553b8d
Change-Id: Ie6995527fb31b9b5f0c272726c80754927770c55
Nicolas Prévot [Wed, 22 Jun 2016 12:27:12 +0000 (12:27 +0000)]
Merge "Don't allow showing an activity if user is stopping or shutting down." into nyc-dev
Nicolas Prevot [Mon, 20 Jun 2016 16:25:12 +0000 (17:25 +0100)]
Don't allow showing an activity if user is stopping or shutting down.
BUG:
29264996
Change-Id: I9fc97c5dc37e6d5656b82b277954b5963eb345c4
Calvin On [Wed, 22 Jun 2016 02:38:11 +0000 (02:38 +0000)]
Merge \"Guard concurrent accesses to BluetoothA2dp service object\" into nyc-mr1-dev
am:
30ec4f2732
Change-Id: Ie9bcb2474c002b8118666c413d864b05eaf0245c
TreeHugger Robot [Wed, 22 Jun 2016 02:31:35 +0000 (02:31 +0000)]
Merge "Guard concurrent accesses to BluetoothA2dp service object" into nyc-mr1-dev
Todd Kennedy [Wed, 22 Jun 2016 01:31:18 +0000 (01:31 +0000)]
Merge \\"Revert \\"Parse \\"vendor/priv-app\\" to find privileged applications\\"\\" into nyc-dev am:
c211539769
am:
4504b0e40c
Change-Id: Ie471dba07286e465da6728be9fca6049a59cec7d
Todd Kennedy [Wed, 22 Jun 2016 01:30:01 +0000 (01:30 +0000)]
Merge \\"Revert \\"Parse \\"vendor/priv-app\\" to find privileged applications\\"\\" into nyc-dev am:
c211539769
am:
fc11796506
Change-Id: Ifb6a9aa8ea5634b7f925ddb022454af040841593
Android Build Merger (Role) [Wed, 22 Jun 2016 01:26:46 +0000 (01:26 +0000)]
Merge "Merge \\"Fix JAVA doc for AudioRecord and AudioTrack Builder\\" into nyc-dev am:
34ed8ad3c2 am:
c5e3f9b539" into nyc-mr1-dev-plus-aosp
Eric Laurent [Wed, 22 Jun 2016 01:26:14 +0000 (01:26 +0000)]
Merge \\"Fix JAVA doc for AudioRecord and AudioTrack Builder\\" into nyc-dev am:
34ed8ad3c2
am:
c5e3f9b539
Change-Id: Ia891f4ab44110b7d82718379c2f18f81dbe07620
Todd Kennedy [Wed, 22 Jun 2016 01:25:27 +0000 (01:25 +0000)]
Merge \"Revert \"Parse \"vendor/priv-app\" to find privileged applications\"\" into nyc-dev
am:
c211539769
Change-Id: I7cdf1552c49f51f7f633f09796453cdd6ce10a26
Todd Kennedy [Wed, 22 Jun 2016 01:25:21 +0000 (01:25 +0000)]
Merge \"Revert \"Parse \"vendor/priv-app\" to find privileged applications\"\" into nyc-dev
am:
c211539769
Change-Id: I305fd763e69bc6d4836193397cb63f632e26a6a9
Eric Laurent [Wed, 22 Jun 2016 01:25:16 +0000 (01:25 +0000)]
Merge \\"Fix JAVA doc for AudioRecord and AudioTrack Builder\\" into nyc-dev am:
34ed8ad3c2
am:
4b44c63852
Change-Id: Ic9cf2dcdff98fd72cce37a0a2d6a147d3f3f8706
Eric Laurent [Wed, 22 Jun 2016 01:17:44 +0000 (01:17 +0000)]
Merge \"Fix JAVA doc for AudioRecord and AudioTrack Builder\" into nyc-dev
am:
34ed8ad3c2
Change-Id: I60746ebe0d2fa3f267b3fa32e5926c158fda9227
Eric Laurent [Wed, 22 Jun 2016 01:17:42 +0000 (01:17 +0000)]
Merge \"Fix JAVA doc for AudioRecord and AudioTrack Builder\" into nyc-dev
am:
34ed8ad3c2
Change-Id: I1de0df33e6e8f8a453d9c94302d16722d2a0a4a6
TreeHugger Robot [Wed, 22 Jun 2016 01:13:55 +0000 (01:13 +0000)]
Merge "Revert "Parse "vendor/priv-app" to find privileged applications"" into nyc-dev
Eric Laurent [Wed, 22 Jun 2016 01:08:44 +0000 (01:08 +0000)]
Merge "Fix JAVA doc for AudioRecord and AudioTrack Builder" into nyc-dev
Calvin On [Mon, 20 Jun 2016 22:59:48 +0000 (15:59 -0700)]
Guard concurrent accesses to BluetoothA2dp service object
This fixes potential NPEs that happen on methods that access
mService after checking nullness, i.e. getConnectedDevices.
Bug:
29514788
Change-Id: Ic97054fd5a3563a374c0e863fb116c52535a6509
Dirk Dougherty [Wed, 22 Jun 2016 01:06:50 +0000 (01:06 +0000)]
Merge \\"Doc change: remove common images from localized directories.\\" into nyc-dev am:
cdb7434140
am:
b0b781abc5
Change-Id: I236e6a84f8ad2fcb15dec51b05b2e5f292506a0e
Adrian Roos [Wed, 22 Jun 2016 01:06:46 +0000 (01:06 +0000)]
Merge \\"Notification: Respect disabled HUNs on updates\\" into nyc-dev am:
394cc084f9
am:
8985d16a56
Change-Id: I1b4f175d0b1410d83c370a72df4608b407f8e905
Dirk Dougherty [Wed, 22 Jun 2016 01:03:43 +0000 (01:03 +0000)]
Merge \\"Doc change: remove common images from localized directories.\\" into nyc-dev am:
cdb7434140
am:
651940576c
Change-Id: I3806c8d10c093bd938823d2939e878db731a0276
Doris Liu [Wed, 22 Jun 2016 00:56:39 +0000 (00:56 +0000)]
Merge \"Make sure VD animation push staging happens only in MODE_FULL\" into nyc-mr1-dev
am:
41fb30282e
Change-Id: I1c2009a4491605a290dbc4596f9b39fbe19a08d0
Dirk Dougherty [Wed, 22 Jun 2016 00:53:01 +0000 (00:53 +0000)]
Merge \"Doc change: remove common images from localized directories.\" into nyc-dev
am:
cdb7434140
Change-Id: Ie7db6e0c1ad664c93241b5c153f559b4a364bad8
Dirk Dougherty [Wed, 22 Jun 2016 00:52:59 +0000 (00:52 +0000)]
Merge \"Doc change: remove common images from localized directories.\" into nyc-dev
am:
cdb7434140
Change-Id: Ia46e43c572d0609d2f8da915b27c77f2822a216f
Adrian Roos [Wed, 22 Jun 2016 00:52:56 +0000 (00:52 +0000)]
Merge \"Notification: Respect disabled HUNs on updates\" into nyc-dev
am:
394cc084f9
Change-Id: Ibb1b69ea313a45637558add62503a05133b3e7a9
Adrian Roos [Wed, 22 Jun 2016 00:52:55 +0000 (00:52 +0000)]
Merge \\"Notification: Respect disabled HUNs on updates\\" into nyc-dev am:
394cc084f9
am:
7f7951f6fc
Change-Id: I8573400aae3381568e1c7bcee580c05bec71aa95
Adrian Roos [Wed, 22 Jun 2016 00:41:35 +0000 (00:41 +0000)]
Merge \"Notification: Respect disabled HUNs on updates\" into nyc-dev
am:
394cc084f9
Change-Id: Ief37365ae7569c76633137b661a2b50e2110670d
Doris Liu [Wed, 22 Jun 2016 00:40:47 +0000 (00:40 +0000)]
Merge "Make sure VD animation push staging happens only in MODE_FULL" into nyc-mr1-dev
Dirk Dougherty [Wed, 22 Jun 2016 00:38:25 +0000 (00:38 +0000)]
Merge "Doc change: remove common images from localized directories." into nyc-dev
TreeHugger Robot [Wed, 22 Jun 2016 00:35:28 +0000 (00:35 +0000)]
Merge "Notification: Respect disabled HUNs on updates" into nyc-dev
daisuke niwa [Wed, 22 Jun 2016 00:25:59 +0000 (00:25 +0000)]
Merge \"Fix invitation request from persistent GC\" into nyc-mr1-dev
am:
72abb6a42e
Change-Id: Ib45f08c9209b69cc811c268cce499e542c1d2efd
Paul Stewart [Wed, 22 Jun 2016 00:19:23 +0000 (00:19 +0000)]
Merge "Fix invitation request from persistent GC" into nyc-mr1-dev
Adrian Roos [Wed, 22 Jun 2016 00:16:15 +0000 (00:16 +0000)]
Merge \\"Fix stale transformations\\" into nyc-dev am:
ea16efd52c
am:
9a3b3953c1
Change-Id: Idc37e61f9b56e491464769852ae9bc74e91b1a8e
Sudheer Shanka [Wed, 22 Jun 2016 00:16:09 +0000 (00:16 +0000)]
Merge \\\\\\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\\\\\" into lmp-dev am:
b43fe62933 -s ours am:
96676a2d41 am:
a9b937b29d am:
47da8a0bdc -s ours am:
e01775f0be am:
5e41f90a92 am:
80e720742b am:
565d13f17e -s ours am:
e4e424d80d
am:
44f24379cf
Change-Id: I17307c3011b7bcf5fc2e2c5a8a1e707227bc36b7
Sudheer Shanka [Wed, 22 Jun 2016 00:08:09 +0000 (00:08 +0000)]
Merge \\\\\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\\\\" into lmp-dev am:
e64034a27d -s ours am:
db7e70c2f0 am:
e0cc5e20ae am:
0d457d1254 -s ours am:
199f6a490a am:
06c3f60136 am:
9088be4ebe am:
95c9bef53b -s ours am:
00e79982aa
am:
e8af546d37
Change-Id: I80240ac1163e2f2986ed639dc728945dabb97609
Sudheer Shanka [Wed, 22 Jun 2016 00:08:05 +0000 (00:08 +0000)]
Merge \\\\\\"Add pm operation to set user restrictions.\\\\\\" into mnc-dev am:
144b3a42cc am:
f43aa2e837 am:
916728bb35 am:
4e8aa0f35f -s ours am:
b0de5fd328
am:
45c9f542e7
Change-Id: I790a462b852be295fed36a8c6b80a9d37391b28e
Sudheer Shanka [Wed, 22 Jun 2016 00:08:02 +0000 (00:08 +0000)]
Merge \\\\\\"Reduce shell power over user management.\\\\\\" into mnc-dev am:
964500fd43 am:
9bfa0ad22f am:
fb87ae59b0 am:
63e8198685 -s ours am:
a5e89439ff
am:
25d2682bef
Change-Id: Ic03848c29b69665805b704948276edfb9d55f270
Selim Cinek [Wed, 22 Jun 2016 00:07:59 +0000 (00:07 +0000)]
Merge \\"Do animations correctly in systemUI\\" into nyc-dev am:
afa0f25379
am:
0864de19f6
Change-Id: I6deba21b568c0713921c27af7f9a881bc1eea9e4
Kevin Hufnagle [Wed, 22 Jun 2016 00:07:56 +0000 (00:07 +0000)]
Merge \\\\"docs: Noted that orderId is blank for all test purchases.\\\\" into mnc-io-docs am:
b47e5dc798 am:
1b0751e097 am:
97fb7a734f
am:
d857bb457d
Change-Id: Id5ba170847b72a0859e4bd168dbc778ca05a8aaf
Dante Russo [Wed, 22 Jun 2016 00:04:56 +0000 (00:04 +0000)]
Merge \\"Prevent startNavigating() call when GPS is off\\" into nyc-dev am:
472224cd81
am:
b4bb0ad543
Change-Id: Ic96b087d87170de3477ee381adc9cb84a0114816
Chris Wren [Wed, 22 Jun 2016 00:04:52 +0000 (00:04 +0000)]
Merge \\"registerUpdatedByApp should be synchronized\\" into nyc-dev am:
7595478ff2
am:
c256a9db61
Change-Id: I13583ac5d2c1141783524c06d015b57129cadaac
Robert Carr [Wed, 22 Jun 2016 00:04:49 +0000 (00:04 +0000)]
Merge \"Merge \\"Don\\'t try and resolve WRAP_CONTENT too early.\\" into nyc-dev am:
72ce991692\" into nyc-mr1-dev
am:
d74f7e7362
Change-Id: Idd2e7fe8ed6a68d332347806cc7c7f5e589314d9
Yorke Lee [Wed, 22 Jun 2016 00:04:45 +0000 (00:04 +0000)]
Merge \"Merge \\"Tweaks to DragAndDropPermissions behavior\\" into nyc-dev am:
22faa5ddb1\" into nyc-mr1-dev
am:
4d46efc084
Change-Id: I3fc48da5be2fe9b45d64f0c776fe74ace89f5f60
Bennie Ouyang [Wed, 22 Jun 2016 00:04:41 +0000 (00:04 +0000)]
Merge \"Merge \\"Fixed notificaiton Stress Test\\" into nyc-dev am:
2f59ee10b2\" into nyc-mr1-dev
am:
a762f71243
Change-Id: I3f75c445b2bf2dd86e43fba8d80390db1f107cc2
Adrian Roos [Tue, 21 Jun 2016 23:56:54 +0000 (23:56 +0000)]
Merge \"Fix stale transformations\" into nyc-dev
am:
ea16efd52c
Change-Id: I995823bc7985da570b13d8d7b8c7b5d1f555d3b2
Sudheer Shanka [Tue, 21 Jun 2016 23:56:51 +0000 (23:56 +0000)]
Merge \\\\\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\\\\" into lmp-dev am:
b43fe62933 -s ours am:
96676a2d41 am:
a9b937b29d am:
47da8a0bdc -s ours am:
e01775f0be am:
5e41f90a92 am:
80e720742b am:
565d13f17e -s ours
am:
e4e424d80d
Change-Id: I856ba4adbe083a1fd0ca25921a8e717b7d9ca169
Sudheer Shanka [Tue, 21 Jun 2016 23:56:49 +0000 (23:56 +0000)]
Merge \\\\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\\\" into lmp-dev am:
e64034a27d -s ours am:
db7e70c2f0 am:
e0cc5e20ae am:
0d457d1254 -s ours am:
199f6a490a am:
06c3f60136 am:
9088be4ebe am:
95c9bef53b -s ours
am:
00e79982aa
Change-Id: I1e8813e048525dc575f869a8c921ad28ed104db8
Sudheer Shanka [Tue, 21 Jun 2016 23:56:46 +0000 (23:56 +0000)]
Merge \\\\\"Add pm operation to set user restrictions.\\\\\" into mnc-dev am:
144b3a42cc am:
f43aa2e837 am:
916728bb35 am:
4e8aa0f35f -s ours
am:
b0de5fd328
Change-Id: Ie38e12d88c78c85fc71dd7e06e3cb3dd833518c1
Android Build Merger (Role) [Tue, 21 Jun 2016 23:53:43 +0000 (23:53 +0000)]
Merge "Merge \"Merge \\"Always report window move to client\\" into nyc-dev am:
aab580af55\" into nyc-mr1-dev am:
c1229ab8cc" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 21 Jun 2016 23:53:34 +0000 (23:53 +0000)]
Merge "Merge \"Merge \\"Add getApplicationConfigForPackage\\" into nyc-dev am:
abe85d3886\" into nyc-mr1-dev am:
9de968daed" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 21 Jun 2016 23:53:05 +0000 (23:53 +0000)]
Merge "Merge \"Shortcut Manager: Address API council feedback and fix TODOs\" into nyc-mr1-dev am:
3c67b3e47c" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 21 Jun 2016 23:52:52 +0000 (23:52 +0000)]
Merge "Merge \"Add some themes to let Settings use DeviceDefault.\" into nyc-mr1-dev am:
d46ae2f7ed" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 21 Jun 2016 23:52:37 +0000 (23:52 +0000)]
Merge "Merge \"resolve merge conflicts of
fa2715e to nyc-mr1-dev\" into nyc-mr1-dev am:
10973455bc" into nyc-mr1-dev-plus-aosp
Wale Ogunwale [Tue, 21 Jun 2016 23:50:49 +0000 (23:50 +0000)]
Merge \"Merge \\"Always report window move to client\\" into nyc-dev am:
aab580af55\" into nyc-mr1-dev
am:
c1229ab8cc
Change-Id: I0e0debe4eabc031d8c7e287bf2437d86affeb26d
Chad Brubaker [Tue, 21 Jun 2016 23:50:45 +0000 (23:50 +0000)]
Merge \"Merge \\"Add getApplicationConfigForPackage\\" into nyc-dev am:
abe85d3886\" into nyc-mr1-dev
am:
9de968daed
Change-Id: Icb33d954a144da0cf3109fa0df1a98dcd5a07a86
Adrian Roos [Tue, 21 Jun 2016 23:50:41 +0000 (23:50 +0000)]
Merge \\"Fix stale transformations\\" into nyc-dev am:
ea16efd52c
am:
3530cdffe6
Change-Id: Iaab4c72c1bfa4953178b766bc210072c89ed9c6e
Makoto Onuki [Tue, 21 Jun 2016 23:50:32 +0000 (23:50 +0000)]
Merge \"Shortcut Manager: Address API council feedback and fix TODOs\" into nyc-mr1-dev
am:
3c67b3e47c
Change-Id: If7346f3dea63a31592d430b7503af170cb354677
Andrew Sapperstein [Tue, 21 Jun 2016 23:49:47 +0000 (23:49 +0000)]
Merge \"Add some themes to let Settings use DeviceDefault.\" into nyc-mr1-dev
am:
d46ae2f7ed
Change-Id: I0c969751879f4e7b168fcfac4331cefe45089512
Felipe Leme [Tue, 21 Jun 2016 23:49:22 +0000 (23:49 +0000)]
Merge \"resolve merge conflicts of
fa2715e to nyc-mr1-dev\" into nyc-mr1-dev
am:
10973455bc
Change-Id: I45cac1ca8a06196b61379cd86d6ac248bfa5d6b4
Sudheer Shanka [Tue, 21 Jun 2016 23:47:44 +0000 (23:47 +0000)]
Merge \\\\\\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\\\\\" into lmp-dev am:
b43fe62933 -s ours am:
96676a2d41 am:
a9b937b29d am:
47da8a0bdc -s ours am:
e01775f0be am:
5e41f90a92 am:
80e720742b am:
565d13f17e -s ours am:
e4e424d80d
am:
d049736c79
Change-Id: I1d644b84222e6820fb84a49fca296dc245efb958
Sudheer Shanka [Tue, 21 Jun 2016 23:47:41 +0000 (23:47 +0000)]
Merge \\\\\\\\\\"DO NOT MERGE: Reduce shell power over user management.\\\\\\\\\\" into lmp-dev am:
e64034a27d -s ours am:
db7e70c2f0 am:
e0cc5e20ae am:
0d457d1254 -s ours am:
199f6a490a am:
06c3f60136 am:
9088be4ebe am:
95c9bef53b -s ours am:
00e79982aa
am:
c2ca406683
Change-Id: I8c8084567b8bdb954966ccb2360cbc27b89d65d3
Sudheer Shanka [Tue, 21 Jun 2016 23:47:38 +0000 (23:47 +0000)]
Merge \\\\\\"Add pm operation to set user restrictions.\\\\\\" into mnc-dev am:
144b3a42cc am:
f43aa2e837 am:
916728bb35 am:
4e8aa0f35f -s ours am:
b0de5fd328
am:
5bf93280bf
Change-Id: Ifff24ce3bbf2170a5ffc20ce7192624c0caa56e3
Sudheer Shanka [Tue, 21 Jun 2016 23:47:34 +0000 (23:47 +0000)]
Merge \\\\\\"Reduce shell power over user management.\\\\\\" into mnc-dev am:
964500fd43 am:
9bfa0ad22f am:
fb87ae59b0 am:
63e8198685 -s ours am:
a5e89439ff
am:
56056bd6c9
Change-Id: I8bf065f8d762db601a12240a980dbfef88da9ba8
Selim Cinek [Tue, 21 Jun 2016 23:47:30 +0000 (23:47 +0000)]
Merge \\"Do animations correctly in systemUI\\" into nyc-dev am:
afa0f25379
am:
55e2fc0326
Change-Id: I270dcdd7a9e7106802596e3c724ae0cc9796c589
Kevin Hufnagle [Tue, 21 Jun 2016 23:40:34 +0000 (23:40 +0000)]
Merge \\\\"docs: Noted that orderId is blank for all test purchases.\\\\" into mnc-io-docs am:
b47e5dc798 am:
1b0751e097 am:
97fb7a734f
am:
83b44f9dee
Change-Id: I3c79346e00263fc81c21e8956d2a3715d587381f
Dante Russo [Tue, 21 Jun 2016 23:40:32 +0000 (23:40 +0000)]
Merge \\"Prevent startNavigating() call when GPS is off\\" into nyc-dev am:
472224cd81
am:
46c2363a12
Change-Id: I6c2f43463ee98dcc26c5359729d821c8d4d825a0
Chris Wren [Tue, 21 Jun 2016 23:40:30 +0000 (23:40 +0000)]
Merge \\"registerUpdatedByApp should be synchronized\\" into nyc-dev am:
7595478ff2
am:
732053f994
Change-Id: Ia1a806cf0a63f8a2da95a850e0cab9b45b5640d1
Marie Janssen [Tue, 21 Jun 2016 23:40:28 +0000 (23:40 +0000)]
Merge \\\"Fix links to Bluetooth Guide\\\" am:
6ba39e5642 am:
51f620d98d
am:
30975ad80b
Change-Id: I99e17125cf95165b911c6e8f294e2f020d483cb2
Sudheer Shanka [Tue, 21 Jun 2016 23:40:26 +0000 (23:40 +0000)]
Merge \\\\\"Reduce shell power over user management.\\\\\" into mnc-dev am:
964500fd43 am:
9bfa0ad22f am:
fb87ae59b0 am:
63e8198685 -s ours
am:
a5e89439ff
Change-Id: I05e684e2a8442a98cbeea82c26c222ce6e52aaeb
Robert Carr [Tue, 21 Jun 2016 23:40:26 +0000 (23:40 +0000)]
Merge \\"Don\\'t try and resolve WRAP_CONTENT too early.\\" into nyc-dev am:
72ce991692
am:
5a35355364
Change-Id: I80c0d1fc372efcff69b49ac485bce460d542c044
Selim Cinek [Tue, 21 Jun 2016 23:40:24 +0000 (23:40 +0000)]
Merge \"Do animations correctly in systemUI\" into nyc-dev
am:
afa0f25379
Change-Id: I086a344e2a3c827c7492ff9aa614b717ff74d1f7
Kevin Hufnagle [Tue, 21 Jun 2016 23:40:22 +0000 (23:40 +0000)]
Merge \\\"docs: Noted that orderId is blank for all test purchases.\\\" into mnc-io-docs am:
b47e5dc798 am:
1b0751e097
am:
97fb7a734f
Change-Id: Ibb83e6b87afb4c8e36f47f3425540fe925e47b3f
Dante Russo [Tue, 21 Jun 2016 23:40:19 +0000 (23:40 +0000)]
Merge \"Prevent startNavigating() call when GPS is off\" into nyc-dev
am:
472224cd81
Change-Id: I55efccceb766a07075088b3c70301aa303cfb26f
Chris Wren [Tue, 21 Jun 2016 23:40:17 +0000 (23:40 +0000)]
Merge \"registerUpdatedByApp should be synchronized\" into nyc-dev
am:
7595478ff2
Change-Id: I9941c51ab0f5d30742aa27c1a7d4850b142fb021
Yorke Lee [Tue, 21 Jun 2016 23:37:51 +0000 (23:37 +0000)]
Merge \\"Tweaks to DragAndDropPermissions behavior\\" into nyc-dev am:
22faa5ddb1
am:
072ce0c29c
Change-Id: Iee2afec7bd3b6d6a81ce179df9e52a9e20bc1b72
AnubhavGupta [Tue, 21 Jun 2016 23:37:48 +0000 (23:37 +0000)]
Merge \\\"Bluetooth: Send GET request as single packet\\\" am:
3d20e6f90f am:
564166458e
am:
b481154647
Change-Id: I0acc65061f495cfd9056ae9c5d3d04a887a2ebdd
Bennie Ouyang [Tue, 21 Jun 2016 23:37:46 +0000 (23:37 +0000)]
Merge \\"Fixed notificaiton Stress Test\\" into nyc-dev am:
2f59ee10b2
am:
557251287d
Change-Id: Idd499dfb8cbd04ec0f758b8df1c836ca0a825e79
OSDN Git Service
