OSDN Git Service
Brian Carlstrom [Fri, 14 Mar 2014 13:21:28 +0000 (06:21 -0700)]
am
2df4b6a0: am
2facefe6: am
00d115a7: resolved conflicts for merge of
aa737c49 to klp-modular-dev-plus-aosp
* commit '
2df4b6a050452c48a31a9543e63388d4fc2433ba':
DO NOT MERGE - Remove data dirs if a new install fails dexopt.
Brian Carlstrom [Fri, 14 Mar 2014 13:13:34 +0000 (13:13 +0000)]
am
2facefe6: am
00d115a7: resolved conflicts for merge of
aa737c49 to klp-modular-dev-plus-aosp
* commit '
2facefe648996732c61a8a26c76704faa6d20e56':
DO NOT MERGE - Remove data dirs if a new install fails dexopt.
Naofumi Harada [Fri, 14 Mar 2014 10:36:47 +0000 (03:36 -0700)]
am
73dca274: am
0a167a98: (-s ours) am
107041e2: am
03263ce3: am
3b182261: am
68c0346b: DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
* commit '
73dca274796dc6c8a2e59e19d7ee59fe529f678d':
DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
Chad Brubaker [Fri, 14 Mar 2014 10:36:44 +0000 (03:36 -0700)]
am
d3619645: am
0b925975: (-s ours) am
48dd8b0f: am
74f99a4e: am
7fb07438: am
674f85af: Merge "Only allow System apps to make VPN exempt routes" into klp-dev
* commit '
d3619645103a7fc345bd027f5fdd62f771ba9f5b':
Only allow System apps to make VPN exempt routes
Naofumi Harada [Fri, 14 Mar 2014 10:34:34 +0000 (10:34 +0000)]
am
0a167a98: (-s ours) am
107041e2: am
03263ce3: am
3b182261: am
68c0346b: DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
* commit '
0a167a98658afdb220ffd62b00d2e65d2baed3d3':
DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
Chad Brubaker [Fri, 14 Mar 2014 10:34:30 +0000 (10:34 +0000)]
am
0b925975: (-s ours) am
48dd8b0f: am
74f99a4e: am
7fb07438: am
674f85af: Merge "Only allow System apps to make VPN exempt routes" into klp-dev
* commit '
0b925975b88c91285df97ca26cebb8f8429ec0da':
Only allow System apps to make VPN exempt routes
Chad Brubaker [Fri, 14 Mar 2014 10:31:54 +0000 (03:31 -0700)]
am
8a48ebb0: am
6467e900: (-s ours) am
7f68f7f4: am
f5729a6a: am
1011960c: am
decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev
* commit '
8a48ebb0a01ebaf1c655e0a4f601d62213e46446':
Add the calling package name to requestRouteToHost
Chad Brubaker [Fri, 14 Mar 2014 10:28:28 +0000 (10:28 +0000)]
am
6467e900: (-s ours) am
7f68f7f4: am
f5729a6a: am
1011960c: am
decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev
* commit '
6467e900a1211de65ae70cc722c871987e0b6531':
Add the calling package name to requestRouteToHost
Evan Charlton [Fri, 14 Mar 2014 04:58:48 +0000 (04:58 +0000)]
Merge "Fix the SDK build" into master-nova
Evan Charlton [Fri, 14 Mar 2014 04:55:27 +0000 (21:55 -0700)]
Fix the SDK build
Fix a bad {@link} tag which was breaking the SDK javadocs build.
Change-Id: Ib44fc5c21738fa65ef3cec72f8c0e8e8f4b938c2
Jose Lima [Fri, 14 Mar 2014 04:30:03 +0000 (21:30 -0700)]
am
92703e62: resolved conflicts for merge of
4882ddfa to master
* commit '
92703e62c1dc88a410a32b05c2d44f391c193140':
Add banner attribute to app manifest
Jose Lima [Fri, 14 Mar 2014 04:26:48 +0000 (21:26 -0700)]
resolved conflicts for merge of
4882ddfa to master
Change-Id: I179899697c148ac34a67b195e2dbd3df2f9138de
Christopher Tate [Fri, 14 Mar 2014 00:26:08 +0000 (17:26 -0700)]
am
87dbf308: am
83b31aae: (-s ours) am
d5b25cbd: am
aaaeb6a2: am
87503f85: am
e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev
* commit '
87dbf308fcde409a73921a6da95d93bcb5e8c106':
DO NOT MERGE - Don't hang installs if the transport disappears
Baligh Uddin [Fri, 14 Mar 2014 00:26:05 +0000 (17:26 -0700)]
am
25e41f43: (-s ours) am
e4f1c8ab: (-s ours) am
c48e3d03: (-s ours) am
4c9ebc4c: (-s ours) am
c6ccb8a3: (-s ours) am
7138395b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
25e41f4345c2e58e31c0e32507b6475107d9a286':
Import translations. DO NOT MERGE
Alan Viverette [Fri, 14 Mar 2014 00:26:02 +0000 (17:26 -0700)]
am
050246e0: am
70994e9e: (-s ours) am
d7cc4bf4: am
cf2b65ce: am
9ebe031c: am
6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev
* commit '
050246e0ebb14828110f07b5978b6ad7d4e6874f':
DO NOT MERGE Quick fix for updating the FastScroller long list property
Alan Viverette [Fri, 14 Mar 2014 00:25:59 +0000 (17:25 -0700)]
am
d2df12c2: am
17bbdcc5: (-s ours) am
839321a3: am
c25dbb50: am
7b09a4e5: am
e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev
* commit '
d2df12c219b051acf4cc8fb3c6d78f7d1d4a814b':
DO NOT MERGE Check item type before re-binding transient state views
Alan Viverette [Fri, 14 Mar 2014 00:25:56 +0000 (17:25 -0700)]
am
38a3ddf4: am
c59474d2: (-s ours) am
ba3d0fd5: am
af6288b7: am
3c3377a2: am
6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev
* commit '
38a3ddf44a42c07a0ec629537225c9ddd1fd47af':
DO NOT MERGE Ensure transient state views are temporarily detached
Adam Powell [Fri, 14 Mar 2014 00:25:53 +0000 (17:25 -0700)]
am
2e8436b4: am
b287043c: am
4a5c9e94: am
68ec033b: am
75958c29: am
3a153c0d: Merge "Fix a bug in submenu presenter priority handling" into klp-dev
* commit '
2e8436b462f405d195f2370d65e10efe48c7e18f':
Fix a bug in submenu presenter priority handling
Jason Sams [Fri, 14 Mar 2014 00:25:51 +0000 (17:25 -0700)]
am
3bab28f9: am
440613f5: am
276565c8: am
0ebc6b37: (-s ours) Force merge of remaining KLP changes to fix build.
* commit '
3bab28f9e98fb8e2aae8e170bebe0070b7abb3bb':
Force merge of remaining KLP changes to fix build.
Christopher Tate [Fri, 14 Mar 2014 00:23:10 +0000 (00:23 +0000)]
am
83b31aae: (-s ours) am
d5b25cbd: am
aaaeb6a2: am
87503f85: am
e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev
* commit '
83b31aae81402c2b10bd711bc14c6ebdfe4c85bf':
DO NOT MERGE - Don't hang installs if the transport disappears
Baligh Uddin [Fri, 14 Mar 2014 00:23:06 +0000 (00:23 +0000)]
am
e4f1c8ab: (-s ours) am
c48e3d03: (-s ours) am
4c9ebc4c: (-s ours) am
c6ccb8a3: (-s ours) am
7138395b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
e4f1c8ab271c06c03d7b962efed9a669f3c8986b':
Import translations. DO NOT MERGE
Alan Viverette [Fri, 14 Mar 2014 00:23:03 +0000 (00:23 +0000)]
am
70994e9e: (-s ours) am
d7cc4bf4: am
cf2b65ce: am
9ebe031c: am
6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev
* commit '
70994e9eef43b6cf95ec6cf553dd97bf92567587':
DO NOT MERGE Quick fix for updating the FastScroller long list property
Alan Viverette [Fri, 14 Mar 2014 00:22:59 +0000 (00:22 +0000)]
am
17bbdcc5: (-s ours) am
839321a3: am
c25dbb50: am
7b09a4e5: am
e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev
* commit '
17bbdcc549a0469fa3d8ed5778e77964ab7caf2d':
DO NOT MERGE Check item type before re-binding transient state views
Alan Viverette [Fri, 14 Mar 2014 00:22:56 +0000 (00:22 +0000)]
am
c59474d2: (-s ours) am
ba3d0fd5: am
af6288b7: am
3c3377a2: am
6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev
* commit '
c59474d2813be8df40090ca121f9570977796aa7':
DO NOT MERGE Ensure transient state views are temporarily detached
Adam Powell [Fri, 14 Mar 2014 00:22:48 +0000 (00:22 +0000)]
am
b287043c: am
4a5c9e94: am
68ec033b: am
75958c29: am
3a153c0d: Merge "Fix a bug in submenu presenter priority handling" into klp-dev
* commit '
b287043c3d31e8360ba5c11bd6dafda7288db8a9':
Fix a bug in submenu presenter priority handling
Jason Sams [Fri, 14 Mar 2014 00:22:45 +0000 (00:22 +0000)]
am
440613f5: am
276565c8: am
0ebc6b37: (-s ours) Force merge of remaining KLP changes to fix build.
* commit '
440613f5c35577f9a5bbc087b2e306e37bb8f94e':
Force merge of remaining KLP changes to fix build.
Brian Carlstrom [Thu, 13 Mar 2014 23:43:37 +0000 (23:43 +0000)]
am
00d115a7: resolved conflicts for merge of
aa737c49 to klp-modular-dev-plus-aosp
* commit '
00d115a7533df23027f671c90c0ae52684392e4a':
DO NOT MERGE - Remove data dirs if a new install fails dexopt.
Brian Carlstrom [Thu, 13 Mar 2014 23:31:14 +0000 (16:31 -0700)]
resolved conflicts for merge of
aa737c49 to klp-modular-dev-plus-aosp
Change-Id: I1f4e555773fe6138efaf73444525da0f747b01d5
Jason Sams [Thu, 13 Mar 2014 23:18:20 +0000 (16:18 -0700)]
am
a9b8bf05: am
21f97de0: am
35a9e339: am
fc15f899: Fix build issues from bad merge
* commit '
a9b8bf053ca5a1e81160422a38341c7dd4b4022d':
Fix build issues from bad merge
Jason Sams [Thu, 13 Mar 2014 23:18:17 +0000 (16:18 -0700)]
am
da8c79d3: am
4a268aff: am
534606b4: am
632c915c: resolved conflicts for merge of
780d57b8 to klp-modular-dev
* commit '
da8c79d378e3a133bb88d80cf8765bb4f7507d66':
Fix destruction issues relating to AllocationAdapter.
Jason Sams [Thu, 13 Mar 2014 23:12:01 +0000 (23:12 +0000)]
am
21f97de0: am
35a9e339: am
fc15f899: Fix build issues from bad merge
* commit '
21f97de0bc4871cd8759aa8edbf55eb97d4a6ff2':
Fix build issues from bad merge
Jason Sams [Thu, 13 Mar 2014 23:11:58 +0000 (23:11 +0000)]
am
4a268aff: am
534606b4: am
632c915c: resolved conflicts for merge of
780d57b8 to klp-modular-dev
* commit '
4a268affbf2a15d68171036a941c2404eae07833':
Fix destruction issues relating to AllocationAdapter.
Mike Lockwood [Thu, 13 Mar 2014 22:28:33 +0000 (15:28 -0700)]
am
885ddcaa: Merge "MTP: Add support for some audio specific object properties"
* commit '
885ddcaa6df92d173a5b8798d0f37ae63ae2b6a1':
MTP: Add support for some audio specific object properties
Mike Lockwood [Thu, 13 Mar 2014 22:25:08 +0000 (22:25 +0000)]
Merge "MTP: Add support for some audio specific object properties"
Hui Shu [Thu, 13 Mar 2014 22:16:28 +0000 (15:16 -0700)]
am
57ad97fb: Merge "Add removeApi commandline option for doclava and an empty removed.txt"
* commit '
57ad97fb701876ecb87b76f29592a41731aeb487':
Add removeApi commandline option for doclava and an empty removed.txt
Mike Lockwood [Thu, 13 Mar 2014 21:51:29 +0000 (14:51 -0700)]
MTP: Add support for some audio specific object properties
This stops Windows 7 from putting up the
"Your device might not be able to play or view this file" dialog
when copying MP3 files to the device.
Bug:
3195286
Change-Id: Ic5b3fb75309893caae1a4f4b56068a543847f1f7
Hui Shu [Thu, 13 Mar 2014 22:11:40 +0000 (22:11 +0000)]
Merge "Add removeApi commandline option for doclava and an empty removed.txt"
John Reck [Thu, 13 Mar 2014 22:09:31 +0000 (15:09 -0700)]
John Reck [Thu, 13 Mar 2014 22:06:23 +0000 (22:06 +0000)]
Merge "App compat"
John Reck [Thu, 13 Mar 2014 21:53:13 +0000 (14:53 -0700)]
App compat
Bug:
13450310
Change-Id: I32d948a243385d1bb9f2615759127f4b13ce01bd
Maxim Siniavine [Thu, 13 Mar 2014 21:33:27 +0000 (14:33 -0700)]
am
3b98789a: Merge "Fixes for download manager test."
* commit '
3b98789a0efcb5e3e57e504397e1cbf3a0ad81e6':
Fixes for download manager test.
John Spurlock [Thu, 13 Mar 2014 21:29:57 +0000 (14:29 -0700)]
am
57392e14: Merge "Add more information to existing notification_* events."
* commit '
57392e14cd270023c0e85b5c3165d90641060d0c':
Add more information to existing notification_* events.
Maxim Siniavine [Thu, 13 Mar 2014 21:29:45 +0000 (21:29 +0000)]
Merge "Fixes for download manager test."
John Spurlock [Thu, 13 Mar 2014 21:26:35 +0000 (21:26 +0000)]
Merge "Add more information to existing notification_* events."
Jason Sams [Thu, 13 Mar 2014 21:23:20 +0000 (14:23 -0700)]
am
b71af753: am
457c9554: am
2ffcffd0: am
280db650: am
e14d5e90: am
5757bf89: Add hidden minor version ID for support lib workarounds.
* commit '
b71af7535bd42822bbe825d2c153aa78b2961191':
Add hidden minor version ID for support lib workarounds.
Jason Sams [Thu, 13 Mar 2014 21:23:17 +0000 (14:23 -0700)]
am
1d1cfa9a: am
abe8dfb0: am
0641a5d4: am
7f8a4107: am
0165db38: (-s ours) am
ff7256e7: Fix destruction issues relating to AllocationAdapter.
* commit '
1d1cfa9a8db764fbeda8734c18629a4e2b7904b5':
Fix destruction issues relating to AllocationAdapter.
Michael Wright [Thu, 13 Mar 2014 21:23:14 +0000 (14:23 -0700)]
am
63929663: am
444b0c6b: (-s ours) am
f80f60ba: am
d23d916e: Merge "Controllers must have buttons and a movement mechanism." into klp-modular-dev
* commit '
63929663674753ea5222aefa4cfe8b59f4a90e9b':
Controllers must have buttons and a movement mechanism.
Jason Sams [Thu, 13 Mar 2014 21:20:35 +0000 (21:20 +0000)]
am
457c9554: am
2ffcffd0: am
280db650: am
e14d5e90: am
5757bf89: Add hidden minor version ID for support lib workarounds.
* commit '
457c9554766f8c0645c53e2317bb024ad28797fa':
Add hidden minor version ID for support lib workarounds.
Jason Sams [Thu, 13 Mar 2014 21:20:31 +0000 (21:20 +0000)]
am
abe8dfb0: am
0641a5d4: am
7f8a4107: am
0165db38: (-s ours) am
ff7256e7: Fix destruction issues relating to AllocationAdapter.
* commit '
abe8dfb0e37284395b36420ed62f1a93b99bdaf2':
Fix destruction issues relating to AllocationAdapter.
Michael Wright [Thu, 13 Mar 2014 21:20:12 +0000 (21:20 +0000)]
am
444b0c6b: (-s ours) am
f80f60ba: am
d23d916e: Merge "Controllers must have buttons and a movement mechanism." into klp-modular-dev
* commit '
444b0c6b72bf508e3a672fe34d0f4b00cfea19f9':
Controllers must have buttons and a movement mechanism.
Sailesh Nepal [Thu, 13 Mar 2014 21:20:02 +0000 (21:20 +0000)]
Merge "Fix SDK build due to missing import in TelecommConstants" into master-nova
Sailesh Nepal [Thu, 13 Mar 2014 21:16:33 +0000 (14:16 -0700)]
Fix SDK build due to missing import in TelecommConstants
Change-Id: Ieffc1cbfa4edb913125a0c29284d98351b12f9f4
Ruben Brunk [Thu, 13 Mar 2014 20:20:45 +0000 (13:20 -0700)]
am
dba76442: Merge "camera3: Pass vendor tags through binder."
* commit '
dba764426b1657b84a2fb88690be7be34498bd09':
camera3: Pass vendor tags through binder.
Ruben Brunk [Thu, 13 Mar 2014 20:18:36 +0000 (20:18 +0000)]
Merge "camera3: Pass vendor tags through binder."
Ruben Brunk [Sat, 22 Feb 2014 01:40:51 +0000 (17:40 -0800)]
camera3: Pass vendor tags through binder.
Bug:
12134423
Change-Id: Icef3fe9e67160767bdb8244ac49c85b68b497123
Sailesh Nepal [Thu, 13 Mar 2014 18:57:47 +0000 (18:57 +0000)]
Merge "Add constant for Call Id extra" into master-nova
Naofumi Harada [Thu, 13 Mar 2014 18:30:31 +0000 (18:30 +0000)]
am
107041e2: am
03263ce3: am
3b182261: am
68c0346b: DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
* commit '
107041e299a48f9624bf7a70c003effac1c363ce':
DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
Chad Brubaker [Thu, 13 Mar 2014 18:30:28 +0000 (18:30 +0000)]
am
48dd8b0f: am
74f99a4e: am
7fb07438: am
674f85af: Merge "Only allow System apps to make VPN exempt routes" into klp-dev
* commit '
48dd8b0fc0090ebf6cef0a9ac045fc480dd31397':
Only allow System apps to make VPN exempt routes
Chad Brubaker [Thu, 13 Mar 2014 18:30:25 +0000 (18:30 +0000)]
am
7f68f7f4: am
f5729a6a: am
1011960c: am
decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev
* commit '
7f68f7f4a128538c1bbd33c82a40f0cc15994bf9':
Add the calling package name to requestRouteToHost
Naofumi Harada [Thu, 13 Mar 2014 18:23:03 +0000 (18:23 +0000)]
am
03263ce3: am
3b182261: am
68c0346b: DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
* commit '
03263ce38aaca11300595af19d313a9f6e3ead96':
DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
Chad Brubaker [Thu, 13 Mar 2014 18:23:00 +0000 (18:23 +0000)]
am
74f99a4e: am
7fb07438: am
674f85af: Merge "Only allow System apps to make VPN exempt routes" into klp-dev
* commit '
74f99a4e904af56a62f86b81831c23c763b6001e':
Only allow System apps to make VPN exempt routes
Chad Brubaker [Thu, 13 Mar 2014 18:22:57 +0000 (18:22 +0000)]
am
f5729a6a: am
1011960c: am
decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev
* commit '
f5729a6a1573ba27f69a5c5dc144be3f8f60b026':
Add the calling package name to requestRouteToHost
Narayan Kamath [Thu, 13 Mar 2014 18:18:48 +0000 (18:18 +0000)]
am
9af19bee: am
52af2ca9: DO NOT MERGE - Remove data dirs if a new install fails dexopt.
* commit '
9af19bee1c7da8d2e8bc6e40c6e9c1e28e0640c6':
DO NOT MERGE - Remove data dirs if a new install fails dexopt.
Naofumi Harada [Thu, 13 Mar 2014 18:18:45 +0000 (18:18 +0000)]
am
3b182261: am
68c0346b: DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
* commit '
3b18226133f27a5fe9e18f7da17d4cd0d0fa0471':
DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
Chad Brubaker [Thu, 13 Mar 2014 18:18:40 +0000 (18:18 +0000)]
am
7fb07438: am
674f85af: Merge "Only allow System apps to make VPN exempt routes" into klp-dev
* commit '
7fb074389370ac93afc5830189371dc3ec26265c':
Only allow System apps to make VPN exempt routes
Chad Brubaker [Thu, 13 Mar 2014 18:18:36 +0000 (18:18 +0000)]
am
1011960c: am
decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev
* commit '
1011960c44a4f84d53d05199fe1ca09be9473822':
Add the calling package name to requestRouteToHost
John Spurlock [Thu, 13 Mar 2014 16:29:00 +0000 (12:29 -0400)]
Add more information to existing notification_* events.
Include calling UID/PID in the existing
notification_{enqueue/cancel/cancel_all} event logs.
Include a new "reason" arg for cancel + cancel_all to
identify listener vs noman vs statusbarmgr calls.
Found and fixed a cancelAll path (from statusbarmgr)
that was not logging at all.
Bug:
13442201
Change-Id: I2e1f875076a96b1fe3b86e8990641efb1cadfcfb
Craig Mautner [Thu, 13 Mar 2014 18:13:16 +0000 (11:13 -0700)]
am
aea74a59: Add Lock Task Mode.
* commit '
aea74a5977ca9f1054926eb24f247562c3a4a6ba':
Add Lock Task Mode.
Craig Mautner [Sat, 8 Mar 2014 22:23:10 +0000 (14:23 -0800)]
Add Lock Task Mode.
When in lock task mode only the specified task may run. All
attempts to switch to another task are ignored until the task
finishes or a call to stopLockTaskMode() is made.
Change-Id: I6cfe92fe1bcf22cd47b5398c08e23c52a4092dda
Jose Lima [Thu, 13 Mar 2014 18:08:51 +0000 (18:08 +0000)]
am
53ac5ef2: am
91726f4e: Merge "Add banner attribute to app manifest" into klp-modular-dev
* commit '
53ac5ef2141c7e7d99d5c00195bc65e86e7fc403':
Add banner attribute to app manifest
Christopher Tate [Thu, 13 Mar 2014 18:08:49 +0000 (18:08 +0000)]
am
d5b25cbd: am
aaaeb6a2: am
87503f85: am
e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev
* commit '
d5b25cbd570680c361da8807fdfddf135472d338':
DO NOT MERGE - Don't hang installs if the transport disappears
Baligh Uddin [Thu, 13 Mar 2014 18:08:46 +0000 (18:08 +0000)]
am
c48e3d03: (-s ours) am
4c9ebc4c: (-s ours) am
c6ccb8a3: (-s ours) am
7138395b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
c48e3d03436bd428ef5425114ea138ae097f1f20':
Import translations. DO NOT MERGE
Alan Viverette [Thu, 13 Mar 2014 18:08:43 +0000 (18:08 +0000)]
am
d7cc4bf4: am
cf2b65ce: am
9ebe031c: am
6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev
* commit '
d7cc4bf482d69d146eb5386b790816c8a46f278a':
DO NOT MERGE Quick fix for updating the FastScroller long list property
Alan Viverette [Thu, 13 Mar 2014 18:08:40 +0000 (18:08 +0000)]
am
839321a3: am
c25dbb50: am
7b09a4e5: am
e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev
* commit '
839321a362ec1cd40fc7267a7883641bcc8ee429':
DO NOT MERGE Check item type before re-binding transient state views
Alan Viverette [Thu, 13 Mar 2014 18:08:37 +0000 (18:08 +0000)]
am
ba3d0fd5: am
af6288b7: am
3c3377a2: am
6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev
* commit '
ba3d0fd5fc520d1a6dcf6e6abc5f9d90c08e9f88':
DO NOT MERGE Ensure transient state views are temporarily detached
Adam Powell [Thu, 13 Mar 2014 18:08:34 +0000 (18:08 +0000)]
am
4a5c9e94: am
68ec033b: am
75958c29: am
3a153c0d: Merge "Fix a bug in submenu presenter priority handling" into klp-dev
* commit '
4a5c9e941a78299d869b4c9d916fd86187057150':
Fix a bug in submenu presenter priority handling
Jason Sams [Thu, 13 Mar 2014 18:08:31 +0000 (18:08 +0000)]
am
276565c8: am
0ebc6b37: (-s ours) Force merge of remaining KLP changes to fix build.
* commit '
276565c83c05e24819454dea4008ad5096792e4f':
Force merge of remaining KLP changes to fix build.
Jose Lima [Thu, 13 Mar 2014 18:02:50 +0000 (18:02 +0000)]
am
91726f4e: Merge "Add banner attribute to app manifest" into klp-modular-dev
* commit '
91726f4ea7b60025490209ccb2637d712e8d75fd':
Add banner attribute to app manifest
Christopher Tate [Thu, 13 Mar 2014 18:02:45 +0000 (18:02 +0000)]
am
aaaeb6a2: am
87503f85: am
e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev
* commit '
aaaeb6a21bb6cc540fefa6868493bda612a63f22':
DO NOT MERGE - Don't hang installs if the transport disappears
Baligh Uddin [Thu, 13 Mar 2014 18:02:42 +0000 (18:02 +0000)]
am
4c9ebc4c: (-s ours) am
c6ccb8a3: (-s ours) am
7138395b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
4c9ebc4c149627e4ea0ee82f053628021ef8bfe8':
Import translations. DO NOT MERGE
Alan Viverette [Thu, 13 Mar 2014 18:02:17 +0000 (18:02 +0000)]
am
cf2b65ce: am
9ebe031c: am
6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev
* commit '
cf2b65ce7a5a1d60755a00ae4da6cd6b1101af8c':
DO NOT MERGE Quick fix for updating the FastScroller long list property
Alan Viverette [Thu, 13 Mar 2014 18:02:14 +0000 (18:02 +0000)]
am
c25dbb50: am
7b09a4e5: am
e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev
* commit '
c25dbb50c30816c97227b9a26cc46afec4e5318e':
DO NOT MERGE Check item type before re-binding transient state views
Alan Viverette [Thu, 13 Mar 2014 18:02:11 +0000 (18:02 +0000)]
am
af6288b7: am
3c3377a2: am
6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev
* commit '
af6288b721110ffc4b4e68d55398b5ca31fc32e8':
DO NOT MERGE Ensure transient state views are temporarily detached
Adam Powell [Thu, 13 Mar 2014 18:02:08 +0000 (18:02 +0000)]
am
68ec033b: am
75958c29: am
3a153c0d: Merge "Fix a bug in submenu presenter priority handling" into klp-dev
* commit '
68ec033b7c9ea28155bbb007b01d5dbce2239392':
Fix a bug in submenu presenter priority handling
Jason Sams [Thu, 13 Mar 2014 18:02:03 +0000 (18:02 +0000)]
am
0ebc6b37: (-s ours) Force merge of remaining KLP changes to fix build.
* commit '
0ebc6b378dca76b3253b10cf17c3a38a0a50c073':
Force merge of remaining KLP changes to fix build.
Mike Lockwood [Thu, 13 Mar 2014 18:01:09 +0000 (11:01 -0700)]
am
1cb98aea: Merge "USB: Add support for disabling USB permission dialogs."
* commit '
1cb98aeaad2e04e6f1cc4f67c92808aa1c8f50e5':
USB: Add support for disabling USB permission dialogs.
Mike Lockwood [Thu, 13 Mar 2014 17:58:33 +0000 (17:58 +0000)]
Merge "USB: Add support for disabling USB permission dialogs."
Jose Lima [Thu, 13 Mar 2014 17:40:36 +0000 (17:40 +0000)]
Merge "Add banner attribute to app manifest" into klp-modular-dev
Mike Lockwood [Thu, 13 Mar 2014 17:26:53 +0000 (10:26 -0700)]
USB: Add support for disabling USB permission dialogs.
Setting scom.android.internal.R.bool.config_disableUsbPermissionDialogs to true
will disable all USB permission dialogs, allowing apps access to USB devices
and accessories by default.
For prototyping purposes only. This should not be used in real devices.
Bug:
13437578
Change-Id: Ie7bf83882943930b15e5f1edb3044a4a52034273
Christopher Tate [Thu, 13 Mar 2014 17:19:17 +0000 (17:19 +0000)]
am
87503f85: am
e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev
* commit '
87503f8561296fea489f8a3fe8384f61150976da':
DO NOT MERGE - Don't hang installs if the transport disappears
Baligh Uddin [Thu, 13 Mar 2014 17:19:14 +0000 (17:19 +0000)]
am
c6ccb8a3: (-s ours) am
7138395b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
c6ccb8a3d436f2cfe563daf78a5c6706cb7d4274':
Import translations. DO NOT MERGE
Dianne Hackborn [Thu, 13 Mar 2014 17:07:37 +0000 (10:07 -0700)]
am
08fc3a7f: Merge "Fix some uid issues in battery stats."
* commit '
08fc3a7fc24cf16c15f53bab3d061a8c32367655':
Fix some uid issues in battery stats.
Dianne Hackborn [Thu, 13 Mar 2014 17:04:54 +0000 (17:04 +0000)]
Merge "Fix some uid issues in battery stats."
Dianne Hackborn [Thu, 13 Mar 2014 16:50:24 +0000 (09:50 -0700)]
Fix some uid issues in battery stats.
Change-Id: I9f7773568ff12603d51b26d50d758add09bedbb2
Baligh Uddin [Thu, 13 Mar 2014 16:24:37 +0000 (09:24 -0700)]
am
5468ae41: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
5468ae4125d8583982717ab7278207cb79dff9c6':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 13 Mar 2014 16:24:35 +0000 (09:24 -0700)]
am
df385f2b: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
df385f2b4c897e140a7d8208641acc77d5e9a0c1':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 13 Mar 2014 16:22:48 +0000 (16:22 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 13 Mar 2014 16:22:44 +0000 (16:22 +0000)]
Merge "Import translations. DO NOT MERGE"
Jaewan Kim [Thu, 13 Mar 2014 12:28:49 +0000 (05:28 -0700)]
am
68c9d259: Merge "EthernetDataTracker: Return proper interface name"
* commit '
68c9d2592cf492a37194522aa21ae01d6d7e1f4b':
EthernetDataTracker: Return proper interface name
Kenny Guy [Thu, 13 Mar 2014 12:28:45 +0000 (05:28 -0700)]
am
4979ff9f: Merge "Show notifications from related users."
* commit '
4979ff9f280727f15a0e4118426fbd4c3ba9cd31':
Show notifications from related users.
OSDN Git Service
