OSDN Git Service
Selim Cinek [Thu, 1 May 2014 21:27:08 +0000 (21:27 +0000)]
am
1336c0c0: Merge "Opimized the number of calls to updateChildren."
* commit '
1336c0c0381d020c65ebb297e85c874d1aa0761c':
Opimized the number of calls to updateChildren.
Selim Cinek [Thu, 1 May 2014 21:24:07 +0000 (21:24 +0000)]
Merge "Opimized the number of calls to updateChildren."
Michael Wright [Thu, 1 May 2014 21:19:23 +0000 (21:19 +0000)]
am
7ba749da: Merge "Improve Gamepad fallbacks for text entry."
* commit '
7ba749da37f921ee192ba40046d4faa7a26a3606':
Improve Gamepad fallbacks for text entry.
Michael Wright [Thu, 1 May 2014 21:19:20 +0000 (21:19 +0000)]
am
576eedef: Merge "Add unhandledInputEvent API to ViewRoot"
* commit '
576eedefe910d45d46da2f37457e415fdd0479dc':
Add unhandledInputEvent API to ViewRoot
Michael Wright [Thu, 1 May 2014 21:15:44 +0000 (21:15 +0000)]
Merge "Improve Gamepad fallbacks for text entry."
Selim Cinek [Thu, 1 May 2014 21:15:29 +0000 (21:15 +0000)]
am
b1d7d579: Fixed a bug when a notification was quickly added and removed.
* commit '
b1d7d579dc6845cce61107858f8445e0f7dbb770':
Fixed a bug when a notification was quickly added and removed.
Michael Wright [Thu, 1 May 2014 21:15:29 +0000 (21:15 +0000)]
Merge "Add unhandledInputEvent API to ViewRoot"
Selim Cinek [Thu, 1 May 2014 21:01:58 +0000 (23:01 +0200)]
Opimized the number of calls to updateChildren.
Improved the performance by batching multiple calls to updateChildren
to a single call on preDraw.
Change-Id: I386edeb15ac35201d39afcac8beaa48b09245448
Selim Cinek [Thu, 1 May 2014 19:55:31 +0000 (21:55 +0200)]
Fixed a bug when a notification was quickly added and removed.
Change-Id: Id9b1cb771a2b6d1f42b61ef40a637e15c8d8f3b7
Mindy Pereira [Thu, 1 May 2014 20:47:28 +0000 (20:47 +0000)]
am
21a78449: am
ed7e36dc: am
d5e92318: Merge "Update fling min velocity" into klp-modular-dev
* commit '
21a784491775de97dccf7db24a62d942fc2a976f':
Update fling min velocity
Mindy Pereira [Thu, 1 May 2014 20:43:52 +0000 (20:43 +0000)]
am
ed7e36dc: am
d5e92318: Merge "Update fling min velocity" into klp-modular-dev
* commit '
ed7e36dc2ef400916356459f9ea67d66645a85fb':
Update fling min velocity
Jason Monk [Thu, 1 May 2014 20:43:34 +0000 (20:43 +0000)]
am
961a2a72: Merge "Remove unused AndroidProxySelectorRoutePlanner"
* commit '
961a2a72d999aab0109f032633edb5d36b8487e0':
Remove unused AndroidProxySelectorRoutePlanner
Mindy Pereira [Thu, 1 May 2014 20:40:08 +0000 (20:40 +0000)]
am
d5e92318: Merge "Update fling min velocity" into klp-modular-dev
* commit '
d5e92318b69d8af6d91dc3b51738913595e0f536':
Update fling min velocity
Jason Monk [Thu, 1 May 2014 20:37:22 +0000 (20:37 +0000)]
Merge "Remove unused AndroidProxySelectorRoutePlanner"
Mindy Pereira [Thu, 1 May 2014 20:34:35 +0000 (20:34 +0000)]
Merge "Update fling min velocity" into klp-modular-dev
Jason Monk [Thu, 1 May 2014 20:34:30 +0000 (16:34 -0400)]
Remove unused AndroidProxySelectorRoutePlanner
Change-Id: Ib970e1d78c3f990fcf24b953f442dcaa94b68903
Adam Powell [Thu, 1 May 2014 19:57:10 +0000 (19:57 +0000)]
am
856b64e9: Add support for hiding action bars on scroll.
* commit '
856b64e9d8ab445fcef4504b2e20471cdba04b23':
Add support for hiding action bars on scroll.
Adam Powell [Thu, 1 May 2014 17:23:33 +0000 (10:23 -0700)]
Add support for hiding action bars on scroll.
Also tweak the nested scrolling API around nested flings and fix a bug
where recursive nested scrolling would stop prematurely.
Change-Id: I561226db878b2493970440a6af3e2332c56a1913
Selim Cinek [Thu, 1 May 2014 19:34:09 +0000 (19:34 +0000)]
am
76f9cd95: Merge "Fixed a bug where the notification scroller could crash."
* commit '
76f9cd9555d9cada135894590bab8fad335fc888':
Fixed a bug where the notification scroller could crash.
Selim Cinek [Thu, 1 May 2014 19:31:08 +0000 (19:31 +0000)]
Merge "Fixed a bug where the notification scroller could crash."
Selim Cinek [Thu, 1 May 2014 19:23:59 +0000 (21:23 +0200)]
Fixed a bug where the notification scroller could crash.
Due to a race condition the scroller could crash in certain cases
after an animation.
Bug:
14458203
Change-Id: Idc52109550270924bae5857e581574c63452f159
John Spurlock [Thu, 1 May 2014 19:21:37 +0000 (19:21 +0000)]
am
cf21f77a: Merge "Implement long-term condition subscriptions."
* commit '
cf21f77a6973e292714af879c36706aa51a8e790':
Implement long-term condition subscriptions.
John Spurlock [Thu, 1 May 2014 19:17:53 +0000 (19:17 +0000)]
Merge "Implement long-term condition subscriptions."
John Spurlock [Thu, 1 May 2014 13:08:48 +0000 (09:08 -0400)]
Implement long-term condition subscriptions.
Bind long-term conditions (like "in a meeting") to enter/exit
zen mode automatically.
Persist automatic condition subscriptions to maintain them across
reboots.
Normalize condition state binding: true => enter zen, false => exit.
Change-Id: Icba2b8b25c0a352ae8215f4c0a324e4f966c0165
Matthew Williams [Thu, 1 May 2014 18:35:22 +0000 (18:35 +0000)]
am
d037be8d: Address comments/fix javadoc in TaskManager API
* commit '
d037be8d485a4cfcc69abb2497c36eb25ca65844':
Address comments/fix javadoc in TaskManager API
Matthew Williams [Thu, 1 May 2014 17:55:28 +0000 (10:55 -0700)]
Address comments/fix javadoc in TaskManager API
Change-Id: I0cdff12971b88acb40571a5e63b7d644ef629911
RoboErik [Thu, 1 May 2014 18:21:33 +0000 (18:21 +0000)]
RoboErik [Thu, 1 May 2014 18:19:31 +0000 (18:19 +0000)]
Merge "Fix build"
RoboErik [Thu, 1 May 2014 18:16:19 +0000 (11:16 -0700)]
Fix build
A CL missed running update-api after making a change before submitting.
https://googleplex-android.googlesource.com/platform/frameworks/base/+/
6e31c5c82bc5c9bddf9c01d254067ea5bebbd96b
Change-Id: I62b33f07a98ecd546d8128c1eeb4c01bd338f202
Wink Saville [Thu, 1 May 2014 18:07:58 +0000 (18:07 +0000)]
am
192384bb: am
43799457: am
74ec5808: am
7e411f74: Merge "Add support for NETWORK_TYPE_GSM"
* commit '
192384bb2708c49ca6c91432b8c848f43557429a':
Add support for NETWORK_TYPE_GSM
Wink Saville [Thu, 1 May 2014 18:03:57 +0000 (18:03 +0000)]
am
43799457: am
74ec5808: am
7e411f74: Merge "Add support for NETWORK_TYPE_GSM"
* commit '
437994578272f9770748b152c53ec655059d19ec':
Add support for NETWORK_TYPE_GSM
Wink Saville [Thu, 1 May 2014 18:00:50 +0000 (18:00 +0000)]
am
74ec5808: am
7e411f74: Merge "Add support for NETWORK_TYPE_GSM"
* commit '
74ec580873bb56cb5045a25efdb1eb7e2bac384c':
Add support for NETWORK_TYPE_GSM
Robert Ly [Thu, 1 May 2014 18:00:37 +0000 (18:00 +0000)]
am
33aa9254: am
0c88867c: am
01352613: am
a9dfeaa9: am
7fadcf84: Merge "Revert "update wear stack notifications to coincide with devbyte code"" into klp-docs
* commit '
33aa9254ea923d01de904476e1a07bbaab81dbb6':
Revert "update wear stack notifications to coincide with devbyte code"
Robert Ly [Thu, 1 May 2014 18:00:34 +0000 (18:00 +0000)]
am
91c940cc: am
edbabd28: am
e3135059: am
9f129366: am
80b2cbbe: Revert "docs: fix method name"
* commit '
91c940cc3936a59a463eddff0c1201287b0ffbc4':
Revert "docs: fix method name"
Wink Saville [Thu, 1 May 2014 17:57:51 +0000 (17:57 +0000)]
am
7e411f74: Merge "Add support for NETWORK_TYPE_GSM"
* commit '
7e411f74efe6dd383e59634760cccd96da1c209b':
Add support for NETWORK_TYPE_GSM
Robert Ly [Thu, 1 May 2014 17:56:45 +0000 (17:56 +0000)]
am
0c88867c: am
01352613: am
a9dfeaa9: am
7fadcf84: Merge "Revert "update wear stack notifications to coincide with devbyte code"" into klp-docs
* commit '
0c88867c7c626c805e9f466bf9010d2a3115eb42':
Revert "update wear stack notifications to coincide with devbyte code"
Robert Ly [Thu, 1 May 2014 17:56:40 +0000 (17:56 +0000)]
am
edbabd28: am
e3135059: am
9f129366: am
80b2cbbe: Revert "docs: fix method name"
* commit '
edbabd2806a9c5c717eff24c65a718f4d2ece817':
Revert "docs: fix method name"
Wink Saville [Thu, 1 May 2014 17:53:54 +0000 (17:53 +0000)]
Merge "Add support for NETWORK_TYPE_GSM"
Sandeep Kunta [Sat, 10 Aug 2013 15:25:38 +0000 (20:55 +0530)]
Add support for NETWORK_TYPE_GSM
Add support for NETWORK_TYPE_GSM in TelephonyManager and
corresponding mapping in ServicState.java so that when
application queries for getVoiceNetworkType() and currently
camped rat is GSM, they get network mode as GSM instead
of network mode unknown.
Change-Id: Ibe4672b04a5044710d63499c4cf2b6ebe91444bf
Robert Ly [Thu, 1 May 2014 17:51:23 +0000 (17:51 +0000)]
am
01352613: am
a9dfeaa9: am
7fadcf84: Merge "Revert "update wear stack notifications to coincide with devbyte code"" into klp-docs
* commit '
0135261361e21f3585b21ff4498b05bd6d1bf88d':
Revert "update wear stack notifications to coincide with devbyte code"
Robert Ly [Thu, 1 May 2014 17:51:20 +0000 (17:51 +0000)]
am
e3135059: am
9f129366: am
80b2cbbe: Revert "docs: fix method name"
* commit '
e3135059dee534c9d93cfb0c6e4fa7574eff1049':
Revert "docs: fix method name"
Matthew Williams [Thu, 1 May 2014 17:49:34 +0000 (17:49 +0000)]
am
a54edd7e: Merge "TaskManager API first pass."
* commit '
a54edd7eb31e641630d594de37b3ee9ce6ddfa61':
TaskManager API first pass.
Robert Ly [Thu, 1 May 2014 17:47:23 +0000 (17:47 +0000)]
am
a9dfeaa9: am
7fadcf84: Merge "Revert "update wear stack notifications to coincide with devbyte code"" into klp-docs
* commit '
a9dfeaa94083c322fb95d8bd2ac765521ae8bceb':
Revert "update wear stack notifications to coincide with devbyte code"
Robert Ly [Thu, 1 May 2014 17:47:19 +0000 (17:47 +0000)]
am
9f129366: am
80b2cbbe: Revert "docs: fix method name"
* commit '
9f129366e6963aacb00893e0be1892003bc0b39d':
Revert "docs: fix method name"
Matthew Williams [Thu, 1 May 2014 17:45:33 +0000 (17:45 +0000)]
Merge "TaskManager API first pass."
Robert Ly [Thu, 1 May 2014 17:44:16 +0000 (17:44 +0000)]
am
7fadcf84: Merge "Revert "update wear stack notifications to coincide with devbyte code"" into klp-docs
* commit '
7fadcf84244172004568c4107083d415f1285b75':
Revert "update wear stack notifications to coincide with devbyte code"
Robert Ly [Thu, 1 May 2014 17:44:13 +0000 (17:44 +0000)]
am
80b2cbbe: Revert "docs: fix method name"
* commit '
80b2cbbe6c134ff415072f29eaa7392c1ebb0c52':
Revert "docs: fix method name"
Robert Ly [Thu, 1 May 2014 17:41:39 +0000 (17:41 +0000)]
Merge "Revert "update wear stack notifications to coincide with devbyte code"" into klp-docs
Robert Ly [Thu, 1 May 2014 17:40:33 +0000 (17:40 +0000)]
Revert "docs: fix method name"
This reverts commit
b39ce1b6c1dc34b3c99d312bc3f02dcc9efbbaed.
Change-Id: Ib7ed4fac07301dd5640fc41348af0d49ad9ef518
Robert Ly [Thu, 1 May 2014 17:40:16 +0000 (17:40 +0000)]
Revert "update wear stack notifications to coincide with devbyte code"
This reverts commit
b8e3f209af70a7707be75d866b142dc1fccc8d5f.
Change-Id: Iba48e235b23cb0b6ce191809e6eb87395c6d1766
Mark Renouf [Thu, 1 May 2014 17:39:18 +0000 (17:39 +0000)]
am
e4f0c5b4: am
5b72a6ab: am
41615284: Merge "SwipeDismiss: limit fade to 50% alpha while swiping" into klp-modular-dev
* commit '
e4f0c5b4f045fb189bd767d364b40eb1bda7b022':
SwipeDismiss: limit fade to 50% alpha while swiping
Mark Renouf [Thu, 1 May 2014 17:36:04 +0000 (17:36 +0000)]
am
5b72a6ab: am
41615284: Merge "SwipeDismiss: limit fade to 50% alpha while swiping" into klp-modular-dev
* commit '
5b72a6abf85b26e66589db478cc105e7bfec6116':
SwipeDismiss: limit fade to 50% alpha while swiping
Mark Renouf [Thu, 1 May 2014 17:32:10 +0000 (17:32 +0000)]
am
41615284: Merge "SwipeDismiss: limit fade to 50% alpha while swiping" into klp-modular-dev
* commit '
41615284dfb00595ed642c4e31da6a035ff53224':
SwipeDismiss: limit fade to 50% alpha while swiping
Mark Renouf [Thu, 1 May 2014 17:26:45 +0000 (17:26 +0000)]
Merge "SwipeDismiss: limit fade to 50% alpha while swiping" into klp-modular-dev
RoboErik [Thu, 1 May 2014 17:20:26 +0000 (17:20 +0000)]
am
668885a4: Merge "Add Session API calls to RCC and AudioManager"
* commit '
668885a41af63ed7a889e7fb2fa939f5ce3150c6':
Add Session API calls to RCC and AudioManager
RoboErik [Thu, 1 May 2014 17:15:49 +0000 (17:15 +0000)]
am
2e7a9f75: Merge "Add dump to MediaSessionService"
* commit '
2e7a9f75eb1276feb02e506e7379ee472754ac2e':
Add dump to MediaSessionService
RoboErik [Thu, 1 May 2014 17:14:56 +0000 (17:14 +0000)]
Merge "Add Session API calls to RCC and AudioManager"
RoboErik [Wed, 23 Apr 2014 21:38:17 +0000 (14:38 -0700)]
Add Session API calls to RCC and AudioManager
This makes RCC and MediaButtonReceiver (via AudioManager) also use the new Session APIs in parallel to their existing code. This will allow us to bring up the Session compatibility pieces without disrupting the old behavior and then switch everything over to just using the new APIs when ready.
Change-Id: I33ce0a044dea3ec763f2302b91a5e415be27d4a4
RoboErik [Thu, 1 May 2014 17:11:34 +0000 (17:11 +0000)]
Merge "Add dump to MediaSessionService"
Baligh Uddin [Thu, 1 May 2014 16:31:29 +0000 (16:31 +0000)]
am
81814fef: (-s ours) am
1ffec559: (-s ours) am
bf4927ee: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
81814fefc3e0fdb5ab1d96186c53e146ed1f1d56':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 1 May 2014 16:25:29 +0000 (16:25 +0000)]
am
1ffec559: (-s ours) am
bf4927ee: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
1ffec559d04618fbd31eaf972a81c6df324965c1':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 1 May 2014 16:23:14 +0000 (16:23 +0000)]
am
f3e19d02: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
f3e19d024236cc5d71b29dc02092aec6a7052f3a':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 1 May 2014 16:23:11 +0000 (16:23 +0000)]
am
545fe064: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
545fe0643743310c61fcbf00f49145fa5fa47dd2':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 1 May 2014 16:23:07 +0000 (16:23 +0000)]
am
46b74854: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
46b74854a9587c356a1f4a1942e1ab8610f31af8':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 1 May 2014 16:21:50 +0000 (16:21 +0000)]
am
bf4927ee: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
bf4927ee0d085fd0c7eaf1221f709811f3be6f4f':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 1 May 2014 16:18:20 +0000 (16:18 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Thu, 1 May 2014 16:18:17 +0000 (16:18 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 1 May 2014 16:18:12 +0000 (16:18 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 1 May 2014 16:18:06 +0000 (16:18 +0000)]
Merge "Import translations. DO NOT MERGE"
Robert Ly [Thu, 1 May 2014 16:09:54 +0000 (16:09 +0000)]
am
933b1a8b: am
f8df90fd: am
007fad0d: am
6b7f3936: am
b39ce1b6: docs: fix method name
* commit '
933b1a8b346aed95738872b1bf4fd7fa39e0958d':
docs: fix method name
Robert Ly [Thu, 1 May 2014 16:06:05 +0000 (16:06 +0000)]
am
f8df90fd: am
007fad0d: am
6b7f3936: am
b39ce1b6: docs: fix method name
* commit '
f8df90fd6a4afffd9ff51a91df55e3a6fd62f67c':
docs: fix method name
Selim Cinek [Thu, 1 May 2014 16:05:29 +0000 (16:05 +0000)]
am
abba15b5: Merge "Fixed several bugs regarding the state of the notifications"
* commit '
abba15b5787ce986d3b453f63f87b71881854bea':
Fixed several bugs regarding the state of the notifications
Robert Ly [Thu, 1 May 2014 16:02:16 +0000 (16:02 +0000)]
am
007fad0d: am
6b7f3936: am
b39ce1b6: docs: fix method name
* commit '
007fad0dbd3f8bd3a8b7323a4587eab954093f27':
docs: fix method name
Selim Cinek [Thu, 1 May 2014 16:01:50 +0000 (16:01 +0000)]
Merge "Fixed several bugs regarding the state of the notifications"
Robert Ly [Thu, 1 May 2014 15:56:58 +0000 (15:56 +0000)]
am
6b7f3936: am
b39ce1b6: docs: fix method name
* commit '
6b7f3936ede97bf29ab5d606c172ff2be7bf9160':
docs: fix method name
Alexandra Gherghina [Thu, 1 May 2014 15:53:54 +0000 (15:53 +0000)]
am
8bb3003f: Merge "Revert "Temporarily switch off returning only enabled profiles to support dogfooding""
* commit '
8bb3003fca6a678fb3df524ed6779dc9210fca86':
Revert "Temporarily switch off returning only enabled profiles to support dogfooding"
Marco Nelissen [Thu, 1 May 2014 15:53:50 +0000 (15:53 +0000)]
am
ce7268e0: am
4375e848: am
ab962b54: am
ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."
* commit '
ce7268e0ae210ef44361d931c7f0ce9737c09e9c':
MetadataRetriever: Check null pointer to avoid tombstone crash.
Robert Ly [Thu, 1 May 2014 15:53:03 +0000 (15:53 +0000)]
am
b39ce1b6: docs: fix method name
* commit '
b39ce1b6c1dc34b3c99d312bc3f02dcc9efbbaed':
docs: fix method name
Robert Ly [Thu, 1 May 2014 15:47:14 +0000 (08:47 -0700)]
docs: fix method name
Change-Id: If7efbc891eb8f1403bd167ae21d17a2847b257cc
Alexandra Gherghina [Thu, 1 May 2014 15:42:07 +0000 (15:42 +0000)]
Merge "Revert "Temporarily switch off returning only enabled profiles to support dogfooding""
Selim Cinek [Thu, 1 May 2014 13:51:58 +0000 (15:51 +0200)]
Fixed several bugs regarding the state of the notifications
Fixed an issue where the last card was hidden even though there would
have been enough space to show it when it was expanded.
Also fixed an issue where the first card was not expandable when it was
the only one.
In addition the scroll range was corrected, to ensure that the last card
could always be scrolled to full visibility, which was not the case
previously when the last card was expanded.
Bug:
14376035
Change-Id: I372a55dc1fc6e381dd9aef3d631447912e3d1024
Marco Nelissen [Thu, 1 May 2014 15:35:31 +0000 (15:35 +0000)]
am
4375e848: am
ab962b54: am
ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."
* commit '
4375e84882a9a84b0012cf9504a30ede6ef72c1f':
MetadataRetriever: Check null pointer to avoid tombstone crash.
Marco Nelissen [Thu, 1 May 2014 15:32:17 +0000 (15:32 +0000)]
am
ab962b54: am
ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."
* commit '
ab962b54e3eac4ffadb5ea4e4948df10e6201468':
MetadataRetriever: Check null pointer to avoid tombstone crash.
Marco Nelissen [Thu, 1 May 2014 15:28:14 +0000 (15:28 +0000)]
am
ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."
* commit '
ab3977d21161815c130bdedf21e2571382d208da':
MetadataRetriever: Check null pointer to avoid tombstone crash.
Marco Nelissen [Thu, 1 May 2014 15:25:13 +0000 (15:25 +0000)]
Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."
Narayan Kamath [Thu, 1 May 2014 14:54:07 +0000 (14:54 +0000)]
am
9a3e54e7: am
53138105: am
5dca099d: am
1cec7f85: Merge "Don\'t adjust ABI if PackageSetting#pkg is null."
* commit '
9a3e54e73e25507472e8eabca0dd30c30011c5db':
Don't adjust ABI if PackageSetting#pkg is null.
Narayan Kamath [Thu, 1 May 2014 14:53:58 +0000 (14:53 +0000)]
am
1cb9322a: am
d6809b35: am
c1f81f90: am
27f2bfc4: Merge "Fix dex file pruning logic."
* commit '
1cb9322a289286d200de2686d979373b5ab97dfd':
Fix dex file pruning logic.
Narayan Kamath [Thu, 1 May 2014 14:53:55 +0000 (14:53 +0000)]
am
cd99b824: am
fbd80b58: (-s ours) am
51f4367c: am
bcc3b312: Merge "Adjust instruction sets for shared UID apps."
* commit '
cd99b8246065e92d6c7987b937abd213a9b525d5':
Adjust instruction sets for shared UID apps.
Narayan Kamath [Thu, 1 May 2014 14:51:04 +0000 (14:51 +0000)]
am
53138105: am
5dca099d: am
1cec7f85: Merge "Don\'t adjust ABI if PackageSetting#pkg is null."
* commit '
531381056fac077cffcd509b1e89d9b41f400fca':
Don't adjust ABI if PackageSetting#pkg is null.
Narayan Kamath [Thu, 1 May 2014 14:51:00 +0000 (14:51 +0000)]
am
d6809b35: am
c1f81f90: am
27f2bfc4: Merge "Fix dex file pruning logic."
* commit '
d6809b35aff02fdccf7ac433005aba2d06bbc3ff':
Fix dex file pruning logic.
Narayan Kamath [Thu, 1 May 2014 14:50:57 +0000 (14:50 +0000)]
am
fbd80b58: (-s ours) am
51f4367c: am
bcc3b312: Merge "Adjust instruction sets for shared UID apps."
* commit '
fbd80b58db2aa8f650acf26305e8cbed24a5755b':
Adjust instruction sets for shared UID apps.
Narayan Kamath [Thu, 1 May 2014 14:49:44 +0000 (14:49 +0000)]
am
921b2f1e: am
3a951e52: (-s ours) resolved conflicts for merge of
69da8a12 to klp-modular-dev-plus-aosp
* commit '
921b2f1e248603c49123f5fb325a215eea768c81':
Package manager changes for dual zygote stack.
George Mount [Thu, 1 May 2014 14:49:41 +0000 (14:49 +0000)]
am
fa509392: Merge "Fixed transition start delay propagation when duration = 0."
* commit '
fa50939227fc4f1c032229b63291ddb0447e3f9c':
Fixed transition start delay propagation when duration = 0.
Narayan Kamath [Thu, 1 May 2014 14:44:38 +0000 (14:44 +0000)]
am
3a951e52: (-s ours) resolved conflicts for merge of
69da8a12 to klp-modular-dev-plus-aosp
* commit '
3a951e52d93697b7e232501b78f9ffb0ec605516':
Package manager changes for dual zygote stack.
George Mount [Thu, 1 May 2014 14:44:02 +0000 (14:44 +0000)]
Merge "Fixed transition start delay propagation when duration = 0."
Narayan Kamath [Thu, 1 May 2014 14:41:42 +0000 (14:41 +0000)]
Narayan Kamath [Thu, 1 May 2014 14:39:20 +0000 (14:39 +0000)]
am
5dca099d: am
1cec7f85: Merge "Don\'t adjust ABI if PackageSetting#pkg is null."
* commit '
5dca099df7100c531e111b50435605c318f1e6d4':
Don't adjust ABI if PackageSetting#pkg is null.
Narayan Kamath [Thu, 1 May 2014 14:39:16 +0000 (14:39 +0000)]
am
c1f81f90: am
27f2bfc4: Merge "Fix dex file pruning logic."
* commit '
c1f81f9086037dde6e082b8a80c84277cb727726':
Fix dex file pruning logic.
Narayan Kamath [Thu, 1 May 2014 14:39:12 +0000 (14:39 +0000)]
am
51f4367c: am
bcc3b312: Merge "Adjust instruction sets for shared UID apps."
* commit '
51f4367cac606580a5ca10ec1cf2dcab3982aebc':
Adjust instruction sets for shared UID apps.
Narayan Kamath [Thu, 1 May 2014 14:37:15 +0000 (15:37 +0100)]
Fix build.
Bad automatic merge by git resulted in a dup. of a function.
Change-Id: Idb8fd8a48e1a9f6aeac98a199d6b8c661efaab16
OSDN Git Service
