OSDN Git Service
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
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
Wale Ogunwale [Tue, 21 Jun 2016 23:37:44 +0000 (23:37 +0000)]
Merge \\"Always report window move to client\\" into nyc-dev am:
aab580af55
am:
354cd88861
Change-Id: I7b14252c02e2cd9f07de59d7ba6d1715fce64aaa
Chad Brubaker [Tue, 21 Jun 2016 23:37:41 +0000 (23:37 +0000)]
Merge \\"Add getApplicationConfigForPackage\\" into nyc-dev am:
abe85d3886
am:
0f1b7d3b3d
Change-Id: I216d4c71c470eb7dbd3e03266f57fd0266475d3a
Android Build Merger (Role) [Tue, 21 Jun 2016 23:37:11 +0000 (23:37 +0000)]
Merge "Merge \"Don\'t try and resolve WRAP_CONTENT too early.\" into nyc-dev am:
72ce991692" into nyc-mr1-dev
Android Build Merger (Role) [Tue, 21 Jun 2016 23:36:59 +0000 (23:36 +0000)]
Merge "Merge \"Tweaks to DragAndDropPermissions behavior\" into nyc-dev am:
22faa5ddb1" into nyc-mr1-dev
Android Build Merger (Role) [Tue, 21 Jun 2016 23:36:47 +0000 (23:36 +0000)]
Merge "Merge \"Fixed notificaiton Stress Test\" into nyc-dev am:
2f59ee10b2" into nyc-mr1-dev
Android Build Merger (Role) [Tue, 21 Jun 2016 23:36:16 +0000 (23:36 +0000)]
Merge "Merge \"Always report window move to client\" into nyc-dev am:
aab580af55" into nyc-mr1-dev
Android Build Merger (Role) [Tue, 21 Jun 2016 23:35:58 +0000 (23:35 +0000)]
Merge "Merge \"Add getApplicationConfigForPackage\" into nyc-dev am:
abe85d3886" into nyc-mr1-dev
Makoto Onuki [Tue, 21 Jun 2016 23:35:14 +0000 (23:35 +0000)]
Merge "Shortcut Manager: Address API council feedback and fix TODOs" into nyc-mr1-dev
Robert Carr [Tue, 21 Jun 2016 23:35:11 +0000 (23:35 +0000)]
Merge \"Don\'t try and resolve WRAP_CONTENT too early.\" into nyc-dev
am:
72ce991692
Change-Id: I277968e2a48ac5647db0f03877ab168afc245a6c
Yorke Lee [Tue, 21 Jun 2016 23:35:09 +0000 (23:35 +0000)]
Merge \"Tweaks to DragAndDropPermissions behavior\" into nyc-dev
am:
22faa5ddb1
Change-Id: Ia37191b026b85773d27b41b7991238a07e141a12
Bennie Ouyang [Tue, 21 Jun 2016 23:35:06 +0000 (23:35 +0000)]
Merge \"Fixed notificaiton Stress Test\" into nyc-dev
am:
2f59ee10b2
Change-Id: I7d52973c6d2d85b3aef692b7447d7ab77034d939
Wale Ogunwale [Tue, 21 Jun 2016 23:35:04 +0000 (23:35 +0000)]
Merge \"Always report window move to client\" into nyc-dev
am:
aab580af55
Change-Id: I393911325b175a545de3ffc8a68348ed08954782
Chad Brubaker [Tue, 21 Jun 2016 23:35:00 +0000 (23:35 +0000)]
Merge \"Add getApplicationConfigForPackage\" into nyc-dev
am:
abe85d3886
Change-Id: I9eb13d905ee68e16b64702180c196f12c9b68828
Adrian Roos [Tue, 21 Jun 2016 23:33:40 +0000 (23:33 +0000)]
Merge \"Fix stale transformations\" into nyc-dev
am:
ea16efd52c
Change-Id: I14088360a948f5e4ef94c5171a2a603b75bbf0e9
Sudheer Shanka [Tue, 21 Jun 2016 23:33:36 +0000 (23:33 +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: I228853b196bd660f3c55f616278700e6623f9783
Sudheer Shanka [Tue, 21 Jun 2016 23:33:33 +0000 (23:33 +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: I190e3d96763d241bbff2346e4c21f368e5906103
TreeHugger Robot [Tue, 21 Jun 2016 23:25:14 +0000 (23:25 +0000)]
Merge "Fix stale transformations" into nyc-dev
Sudheer Shanka [Tue, 21 Jun 2016 23:17:44 +0000 (23:17 +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
Change-Id: I141d8fb97fc5aac644ef50ff07f055ec7a03823e
Sudheer Shanka [Tue, 21 Jun 2016 23:14:52 +0000 (23:14 +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
Change-Id: I745cd1c7129c79daa13c90fe6bbcef43cb39dce2
Sudheer Shanka [Tue, 21 Jun 2016 23:11:08 +0000 (23:11 +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
Change-Id: I7b406c32d9231f2850651d09fc58e2dc50c38b8a
Sudheer Shanka [Tue, 21 Jun 2016 23:10:54 +0000 (23:10 +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
Change-Id: I5b9897a2a3e44faed6f101c52ab729612404c739
Sudheer Shanka [Tue, 21 Jun 2016 23:05:02 +0000 (23:05 +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
Change-Id: I886553aec1438d0857cdc52413008ecaf64bae2a
Andrew Sapperstein [Tue, 21 Jun 2016 23:02:12 +0000 (23:02 +0000)]
Merge "Add some themes to let Settings use DeviceDefault." into nyc-mr1-dev
Sudheer Shanka [Tue, 21 Jun 2016 22:55:40 +0000 (22:55 +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
Change-Id: Ie7b8e901e3fbb46f3d7d76b1bc8ea8bc6c31eb63
Sudheer Shanka [Tue, 21 Jun 2016 22:46:23 +0000 (22:46 +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: I3a751b6cada4c412ce67f3e160936c10f129d07e
Sudheer Shanka [Tue, 21 Jun 2016 22:42:25 +0000 (22:42 +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
Change-Id: Ia4ac90dc59c50aabd1c3de69885c1312e37d915a
Sudheer Shanka [Tue, 21 Jun 2016 22:42:23 +0000 (22:42 +0000)]
Merge \\\\"Add pm operation to set user restrictions.\\\\" into mnc-dev am:
144b3a42cc am:
f43aa2e837 am:
916728bb35
am:
4e8aa0f35f -s ours
Change-Id: Id82e4921ebc46dcf802acad895410ed79026d9ce
Sudheer Shanka [Tue, 21 Jun 2016 22:42:23 +0000 (22:42 +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
Change-Id: Ia9f6d50c60621431781986062491e7c3fbf92f94
Sudheer Shanka [Tue, 21 Jun 2016 22:42:16 +0000 (22:42 +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: Ic5b771c9d8738f6c3a60bb9332c964b26829047a
Sudheer Shanka [Tue, 21 Jun 2016 22:38:39 +0000 (22:38 +0000)]
Merge \\\\"Reduce shell power over user management.\\\\" into mnc-dev am:
964500fd43 am:
9bfa0ad22f am:
fb87ae59b0
am:
63e8198685 -s ours
Change-Id: Id8035a1dde1a4ec04779e68ae14df5d2d4e2530f
Sudheer Shanka [Tue, 21 Jun 2016 22:36:46 +0000 (22:36 +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
Change-Id: Idf654d72b81e9f4c4219f2b7a5f14ba3be021438
Sudheer Shanka [Tue, 21 Jun 2016 22:36:43 +0000 (22:36 +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
Change-Id: Idd92350e26a28821ddc2f9af505b28b5873a7f78
Selim Cinek [Tue, 21 Jun 2016 22:33:11 +0000 (22:33 +0000)]
Merge \"Do animations correctly in systemUI\" into nyc-dev
am:
afa0f25379
Change-Id: Ie72b24e7d84ab4025b0ab148a859ab211c1fdf70
Sudheer Shanka [Tue, 21 Jun 2016 22:31:11 +0000 (22:31 +0000)]
Merge \\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\" into lmp-dev am:
b43fe62933 -s ours am:
96676a2d41
am:
a9b937b29d
Change-Id: Ib0923227e223a7b3a94e4d443e6e5c308977e65b
Sudheer Shanka [Tue, 21 Jun 2016 22:31:09 +0000 (22:31 +0000)]
Merge \\\"DO NOT MERGE: Reduce shell power over user management.\\\" into lmp-dev am:
e64034a27d -s ours am:
db7e70c2f0
am:
e0cc5e20ae
Change-Id: Ia32fa9009d31f280b7f71fd8ed472913c4aa30b6
Sudheer Shanka [Tue, 21 Jun 2016 22:25:34 +0000 (22:25 +0000)]
Merge \\"DO NOT MERGE: Add pm operation to set user restrictions.\\" into lmp-dev am:
b43fe62933 -s ours
am:
96676a2d41
Change-Id: I7a4cdbe7c6ed9abd51e0b172a24b69370edcc1b1
Sudheer Shanka [Tue, 21 Jun 2016 22:25:31 +0000 (22:25 +0000)]
Merge \\\"Add pm operation to set user restrictions.\\\" into mnc-dev am:
144b3a42cc am:
f43aa2e837
am:
916728bb35
Change-Id: Id7990003b3a5a6db9f9d16eb57ec37d47505165a
Sudheer Shanka [Tue, 21 Jun 2016 22:25:31 +0000 (22:25 +0000)]
Merge \\"DO NOT MERGE: Reduce shell power over user management.\\" into lmp-dev am:
e64034a27d -s ours
am:
db7e70c2f0
Change-Id: I8ebc5346b9a8a38efa16f7bbd23ddaa97f3780e0
Sudheer Shanka [Tue, 21 Jun 2016 22:25:19 +0000 (22:25 +0000)]
Merge \\\"Reduce shell power over user management.\\\" into mnc-dev am:
964500fd43 am:
9bfa0ad22f
am:
fb87ae59b0
Change-Id: I4e517e522896242fb9b23b21c217c6fd876ef8b7
TreeHugger Robot [Tue, 21 Jun 2016 22:20:43 +0000 (22:20 +0000)]
Merge "Do animations correctly in systemUI" into nyc-dev
Sudheer Shanka [Tue, 21 Jun 2016 22:19:09 +0000 (22:19 +0000)]
Merge \\"Add pm operation to set user restrictions.\\" into mnc-dev am:
144b3a42cc
am:
f43aa2e837
Change-Id: Ic6c3cf2871105e5f81bbd30ee30311b5d5a535a6
Sudheer Shanka [Tue, 21 Jun 2016 22:19:05 +0000 (22:19 +0000)]
Merge \\"Reduce shell power over user management.\\" into mnc-dev am:
964500fd43
am:
9bfa0ad22f
Change-Id: I952f6a12be0c1edc6027ccce785d47d7f84757ef
Felipe Leme [Tue, 21 Jun 2016 22:15:33 +0000 (22:15 +0000)]
Merge "resolve merge conflicts of
fa2715e to nyc-mr1-dev" into nyc-mr1-dev
Kevin Hufnagle [Tue, 21 Jun 2016 22:13:49 +0000 (22:13 +0000)]
Merge \\\"docs: Noted that orderId is blank for all test purchases.\\\" into mnc-io-docs am:
b47e5dc798 am:
1b0751e097
am:
97fb7a734f
Change-Id: Ib92f816a4ac4a07928d839773a878b6044e98e62
Sudheer Shanka [Tue, 21 Jun 2016 22:12:17 +0000 (22:12 +0000)]
Merge \"DO NOT MERGE: Add pm operation to set user restrictions.\" into lmp-dev
am:
b43fe62933 -s ours
Change-Id: Iad1cc5368a6617b648866cde91e51e5c0b8d68f5
Sudheer Shanka [Tue, 21 Jun 2016 22:12:15 +0000 (22:12 +0000)]
Merge \"DO NOT MERGE: Reduce shell power over user management.\" into lmp-dev
am:
e64034a27d -s ours
Change-Id: I1f1d3ae381040bf37bf23a40e6fdc17f842a13a1
Sudheer Shanka [Tue, 21 Jun 2016 22:11:47 +0000 (22:11 +0000)]
Merge \"Add pm operation to set user restrictions.\" into mnc-dev
am:
144b3a42cc
Change-Id: I1de4650ef53751654145a3ad1c40390711414341
Sudheer Shanka [Tue, 21 Jun 2016 22:11:44 +0000 (22:11 +0000)]
Merge \"Reduce shell power over user management.\" into mnc-dev
am:
964500fd43
Change-Id: I3531a208b4e2bd603bde2afcbee9589bf2f712d9
Kevin Hufnagle [Tue, 21 Jun 2016 22:04:45 +0000 (22:04 +0000)]
Merge \\"docs: Noted that orderId is blank for all test purchases.\\" into mnc-io-docs am:
b47e5dc798
am:
1b0751e097
Change-Id: Ib7fd5bb44a40b721b7893ff3bdd51bbf0e9a278b
Sudheer Shanka [Tue, 21 Jun 2016 22:03:14 +0000 (22:03 +0000)]
Merge "DO NOT MERGE: Add pm operation to set user restrictions." into lmp-dev
Sudheer Shanka [Tue, 21 Jun 2016 22:03:09 +0000 (22:03 +0000)]
Merge "Add pm operation to set user restrictions." into mnc-dev
Sudheer Shanka [Tue, 21 Jun 2016 22:03:08 +0000 (22:03 +0000)]
Merge "DO NOT MERGE: Reduce shell power over user management." into lmp-dev
Sudheer Shanka [Tue, 21 Jun 2016 22:03:04 +0000 (22:03 +0000)]
Merge "Reduce shell power over user management." into mnc-dev
Kevin Hufnagle [Tue, 21 Jun 2016 21:58:30 +0000 (21:58 +0000)]
Merge \"docs: Noted that orderId is blank for all test purchases.\" into mnc-io-docs
am:
b47e5dc798
Change-Id: I3aece10845f33bf2867f2450a9657e9d55152ba1
Kevin Hufnagle [Tue, 21 Jun 2016 21:53:50 +0000 (21:53 +0000)]
Merge "docs: Noted that orderId is blank for all test purchases." into mnc-io-docs
Dante Russo [Tue, 21 Jun 2016 21:52:27 +0000 (21:52 +0000)]
Merge \"Prevent startNavigating() call when GPS is off\" into nyc-dev
am:
472224cd81
Change-Id: Ic81033874380789bb8ad641834414d6f2d82aa20
Chris Wren [Tue, 21 Jun 2016 21:52:23 +0000 (21:52 +0000)]
Merge \"registerUpdatedByApp should be synchronized\" into nyc-dev
am:
7595478ff2
Change-Id: I78349914370d1a72f616b4ee8cd7188fe0a416c1
TreeHugger Robot [Tue, 21 Jun 2016 21:47:25 +0000 (21:47 +0000)]
Merge "Prevent startNavigating() call when GPS is off" into nyc-dev
Chris Wren [Tue, 21 Jun 2016 21:46:33 +0000 (21:46 +0000)]
Merge "registerUpdatedByApp should be synchronized" into nyc-dev
Sudheer Shanka [Thu, 16 Jun 2016 15:58:00 +0000 (08:58 -0700)]
DO NOT MERGE: Add pm operation to set user restrictions.
Bug:
29189712
Change-Id: I6fdb3b68dfe3f51119e5ce8008880fc7d9c793df
Makoto Onuki [Tue, 21 Jun 2016 18:13:53 +0000 (11:13 -0700)]
Shortcut Manager: Address API council feedback and fix TODOs
Bug
29515722
Bug
29516909
Bug
29515090
Bug
29516954
Bug
29515088
Change-Id: Ibe1d27033cbd0fd50d37e3d9945b47551211c568
Marie Janssen [Tue, 21 Jun 2016 21:38:25 +0000 (21:38 +0000)]
Merge \\"Fix links to Bluetooth Guide\\" am:
6ba39e5642
am:
51f620d98d
Change-Id: I3818fdbfc3ad60a731bdf3b7f047a2afca04ad2e
Marie Janssen [Tue, 21 Jun 2016 21:34:13 +0000 (21:34 +0000)]
Merge \"Fix links to Bluetooth Guide\"
am:
6ba39e5642
Change-Id: I0f4e84245e05a19403603121a9138c2076ef2282
OSDN Git Service
