OSDN Git Service
John Reck [Fri, 16 May 2014 16:00:09 +0000 (16:00 +0000)]
am
f18aed83: am
0661ddee: Merge "Enable display list updates with zero delta time"
* commit '
f18aed83f63b41fc9e2fd4cecc1fdf2c08c302c0':
Enable display list updates with zero delta time
John Reck [Fri, 16 May 2014 15:56:07 +0000 (15:56 +0000)]
am
0661ddee: Merge "Enable display list updates with zero delta time"
* commit '
0661ddee112477db180d65e605f34fd538fdf8bc':
Enable display list updates with zero delta time
John Reck [Fri, 16 May 2014 15:51:38 +0000 (15:51 +0000)]
Merge "Enable display list updates with zero delta time"
Griff Hazen [Fri, 16 May 2014 15:40:18 +0000 (15:40 +0000)]
am
959591e3: Add support for extendable actions to Notification.
* commit '
959591e3ba3934f5bd8ecc2c81ad2a16d226acab':
Add support for extendable actions to Notification.
Narayan Kamath [Fri, 16 May 2014 12:29:59 +0000 (12:29 +0000)]
am
49538def: am
79e0206e: Merge "Init the static member when first used for CursorWindow."
* commit '
49538def98520eb57d4fb634bf09b2f3104e7953':
Init the static member when first used for CursorWindow.
Narayan Kamath [Fri, 16 May 2014 12:26:34 +0000 (12:26 +0000)]
am
79e0206e: Merge "Init the static member when first used for CursorWindow."
* commit '
79e0206ef3203a1842949242e58fa8f3c25eb129':
Init the static member when first used for CursorWindow.
Narayan Kamath [Fri, 16 May 2014 12:24:32 +0000 (12:24 +0000)]
Merge "Init the static member when first used for CursorWindow."
Narayan Kamath [Fri, 16 May 2014 12:13:49 +0000 (12:13 +0000)]
am
2c125876: am
8a196c06: Merge "Change InputMessage.motion.pointerSize to a uint32_t."
* commit '
2c125876208c6b7173ef561316843d64ae1599e2':
Change InputMessage.motion.pointerSize to a uint32_t.
Narayan Kamath [Fri, 16 May 2014 12:08:09 +0000 (12:08 +0000)]
am
8a196c06: Merge "Change InputMessage.motion.pointerSize to a uint32_t."
* commit '
8a196c0676eebf10b2120f3305c0b9bcb99e97ce':
Change InputMessage.motion.pointerSize to a uint32_t.
Narayan Kamath [Fri, 16 May 2014 12:06:09 +0000 (12:06 +0000)]
Merge "Change InputMessage.motion.pointerSize to a uint32_t."
Narayan Kamath [Fri, 2 May 2014 16:53:33 +0000 (17:53 +0100)]
Change InputMessage.motion.pointerSize to a uint32_t.
This ensures it's the same size in both 32 and 64 bit
processes and also brings it in line with struct
MotionEntry.
(cherry-picked from commit
bc6001b026069714177526eb1120b0011d6f2a51)
Change-Id: Ide6bb4dc05cc92a7ae8833e615e8ebb2353255a6
Griff Hazen [Fri, 16 May 2014 05:26:18 +0000 (22:26 -0700)]
Add support for extendable actions to Notification.
Change-Id: I2945a6994a28fc454af3f84e75c96d7619547f01
Justin Koh [Thu, 15 May 2014 17:20:23 +0000 (17:20 +0000)]
am
0ade263c: Merge "If there is only 1 simple global action, autolaunch it" into klp-modular-dev
* commit '
0ade263c28ea62e619972752ef2e6a6c994eeddf':
If there is only 1 simple global action, autolaunch it
Justin Koh [Thu, 15 May 2014 17:17:13 +0000 (17:17 +0000)]
Merge "If there is only 1 simple global action, autolaunch it" into klp-modular-dev
Baligh Uddin [Thu, 15 May 2014 14:31:13 +0000 (14:31 +0000)]
am
bd44640c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
bd44640c7f532cdfe2b6d8c3e721abd92fbca65e':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 15 May 2014 14:26:05 +0000 (14:26 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Narayan Kamath [Thu, 15 May 2014 13:41:12 +0000 (13:41 +0000)]
am
be3dc575: am
402120a2: Merge "Wait for secondary zygote before bringing up the system_server."
* commit '
be3dc5754fd081f54a86df9894763c0da915eed3':
Wait for secondary zygote before bringing up the system_server.
Narayan Kamath [Thu, 15 May 2014 13:38:17 +0000 (13:38 +0000)]
am
402120a2: Merge "Wait for secondary zygote before bringing up the system_server."
* commit '
402120a2236b294dff9a51461cb22400a6ef67f6':
Wait for secondary zygote before bringing up the system_server.
Narayan Kamath [Thu, 15 May 2014 13:34:09 +0000 (13:34 +0000)]
Merge "Wait for secondary zygote before bringing up the system_server."
Narayan Kamath [Thu, 15 May 2014 12:45:27 +0000 (12:45 +0000)]
am
6e2e6868: am
706b1d7e: Merge "Remove "required" prefix from ABI fields."
* commit '
6e2e686889037711170ee145f9dfdb442cee85db':
Remove "required" prefix from ABI fields.
Narayan Kamath [Thu, 15 May 2014 12:41:47 +0000 (12:41 +0000)]
am
706b1d7e: Merge "Remove "required" prefix from ABI fields."
* commit '
706b1d7ea0214b6858730e68c95c6a6d6d9a4c30':
Remove "required" prefix from ABI fields.
Narayan Kamath [Thu, 15 May 2014 12:39:34 +0000 (12:39 +0000)]
Merge "Remove "required" prefix from ABI fields."
Narayan Kamath [Wed, 30 Apr 2014 13:38:46 +0000 (14:38 +0100)]
Remove "required" prefix from ABI fields.
As per a comment on an earlier code review.
(cherry-picked from commit
a9d64733421d6765eab5c2730fa912f068e26047)
Change-Id: I064cffc13c323b721f3a16c83e0e95ee348ef9f6
Narayan Kamath [Thu, 15 May 2014 09:45:33 +0000 (09:45 +0000)]
am
eabc93db: am
c4c08803: Merge "app_process: change app_process a symlink of primary version"
* commit '
eabc93db1020be4b71f0db7d5b5d3a7991f3c264':
app_process: change app_process a symlink of primary version
Narayan Kamath [Thu, 15 May 2014 09:41:40 +0000 (09:41 +0000)]
am
c4c08803: Merge "app_process: change app_process a symlink of primary version"
* commit '
c4c08803a8cc090aa27720e97df342231e8433af':
app_process: change app_process a symlink of primary version
Narayan Kamath [Thu, 15 May 2014 09:36:27 +0000 (09:36 +0000)]
Merge "app_process: change app_process a symlink of primary version"
Tina Zhang [Tue, 13 May 2014 08:30:54 +0000 (16:30 +0800)]
Enable display list updates with zero delta time
It's better not to cancel display lists updates. In the emulator, if we use
low precision clock source like refined-jiffies, the display list which
should be updated with a new frame, won't be updated due to the delta time
is 0 . And this makes all the hardware accelerated GUI out of order.
Change-Id: I41dba8965c96b6ad1b6d326ad1d6fa4a0a49173f
Signed-off-by: Tina Zhang <tina.zhang@intel.com>
Ricardo Cervera [Wed, 14 May 2014 23:57:12 +0000 (23:57 +0000)]
am
7c05fd85: am
59ab011e: am
0e286ab1: Merge "docs: Removed outdated troubleshooting guidelines for Android Studio" into klp-docs
* commit '
7c05fd850bfbbbe9139a958102494260b5e6dea2':
docs: Removed outdated troubleshooting guidelines for Android Studio
Mathieu Chartier [Wed, 14 May 2014 23:56:13 +0000 (23:56 +0000)]
am
c0f18b9d: am
c4c77d63: Merge "Add property for background GC type"
* commit '
c0f18b9d0cce0c140b1274055faabff732f1e27c':
Add property for background GC type
Ian Rogers [Wed, 14 May 2014 23:56:06 +0000 (23:56 +0000)]
am
d05c7d26: am
bcf76242: Merge "Move FLATTENED_PATTERN to inner class."
* commit '
d05c7d265170ca6573bbdd97f3c4aaa8e25a6389':
Move FLATTENED_PATTERN to inner class.
Ricardo Cervera [Wed, 14 May 2014 23:53:20 +0000 (23:53 +0000)]
am
59ab011e: am
0e286ab1: Merge "docs: Removed outdated troubleshooting guidelines for Android Studio" into klp-docs
* commit '
59ab011eebc5deb008ae62c0fe353d6d0aac8ab8':
docs: Removed outdated troubleshooting guidelines for Android Studio
Mathieu Chartier [Wed, 14 May 2014 23:52:02 +0000 (23:52 +0000)]
am
c4c77d63: Merge "Add property for background GC type"
* commit '
c4c77d63d889baca2abbdce6326077f0911b279e':
Add property for background GC type
Ian Rogers [Wed, 14 May 2014 23:51:59 +0000 (23:51 +0000)]
am
bcf76242: Merge "Move FLATTENED_PATTERN to inner class."
* commit '
bcf76242134317a2f722eab5af2600fe2858f895':
Move FLATTENED_PATTERN to inner class.
Ricardo Cervera [Wed, 14 May 2014 23:49:24 +0000 (23:49 +0000)]
am
0e286ab1: Merge "docs: Removed outdated troubleshooting guidelines for Android Studio" into klp-docs
* commit '
0e286ab1f0eaeb2bb75c7a76ff8f3d08267e7fc3':
docs: Removed outdated troubleshooting guidelines for Android Studio
Mathieu Chartier [Wed, 14 May 2014 23:07:39 +0000 (23:07 +0000)]
Merge "Add property for background GC type"
Mathieu Chartier [Wed, 14 May 2014 22:44:49 +0000 (15:44 -0700)]
Add property for background GC type
To disable background compaction do:
adb shell setprop dalvik.vm.backgroundgctype CMS
To enable:
adb shell setprop dalvik.vm.backgroundgctype SS
Change-Id: I1d87b95fceaedac4df5ce6e718d7c14b35d524cc
Ricardo Cervera [Wed, 14 May 2014 22:44:56 +0000 (22:44 +0000)]
Merge "docs: Removed outdated troubleshooting guidelines for Android Studio" into klp-docs
Ian Rogers [Wed, 14 May 2014 22:40:58 +0000 (22:40 +0000)]
Merge "Move FLATTENED_PATTERN to inner class."
Ian Rogers [Wed, 14 May 2014 22:29:35 +0000 (15:29 -0700)]
Move FLATTENED_PATTERN to inner class.
Avoid AOT compilation/initialization in ART failing due to regex.Pattern
requiring native support.
Bug:
14646037
Change-Id: I9d9c7fd9ed9fab7e21d37f9b31c00d037fc5a691
Dirk Dougherty [Wed, 14 May 2014 21:24:29 +0000 (21:24 +0000)]
am
0f582284: am
980a285b: am
5eb99943: Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs
* commit '
0f5822847ae3422d939a7959f6a25178fcc12232':
update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED.
Dirk Dougherty [Wed, 14 May 2014 21:24:24 +0000 (21:24 +0000)]
am
0540bc37: am
a4e6c7d1: am
3506ac87: Doc change: Updated content for distribute.
* commit '
0540bc373c84b4ab590708cc9f79c95eeac5114c':
Doc change: Updated content for distribute.
Dirk Dougherty [Wed, 14 May 2014 21:21:23 +0000 (21:21 +0000)]
am
980a285b: am
5eb99943: Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs
* commit '
980a285b4c29254fd65b0426256918ae2b5eea85':
update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED.
Dirk Dougherty [Wed, 14 May 2014 21:21:15 +0000 (21:21 +0000)]
am
a4e6c7d1: am
3506ac87: Doc change: Updated content for distribute.
* commit '
a4e6c7d1d4e6c8ca2b50f91ae8881fb4838d7955':
Doc change: Updated content for distribute.
Dirk Dougherty [Wed, 14 May 2014 21:17:27 +0000 (21:17 +0000)]
am
5eb99943: Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs
* commit '
5eb99943d5cf4ad32c61d94e944c155d1c77a915':
update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED.
Dirk Dougherty [Wed, 14 May 2014 21:17:22 +0000 (21:17 +0000)]
am
3506ac87: Doc change: Updated content for distribute.
* commit '
3506ac87c09c0748d92ef594c94365a5d7b07262':
Doc change: Updated content for distribute.
Dirk Dougherty [Wed, 14 May 2014 21:16:31 +0000 (21:16 +0000)]
Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs
Dirk Dougherty [Fri, 21 Feb 2014 19:15:52 +0000 (11:15 -0800)]
Doc change: Updated content for distribute.
Change-Id: I612fbb8e5b7aedd73c0e633e5517bb89375760ed
Yongqin Liu [Tue, 6 May 2014 15:30:40 +0000 (23:30 +0800)]
app_process: change app_process a symlink of primary version
Change app_process to be a symlink to the primary version
and have app_process32/app_process64 be the 32-bit/64-bit
versions respectively.
This will make it possible to use the primary zygote for
am/pm commands and other scripts that use app_process and
don't need a specific zygote.
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Change-Id: Ibef545994eb95ddc82101c95df613ad1d06345e6
Baligh Uddin [Wed, 14 May 2014 17:44:46 +0000 (10:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I443d4950531e7ab7018cb5db1b8316f1b8baaa9e
Auto-generated-cl: translation import
Justin Koh [Mon, 12 May 2014 23:00:36 +0000 (16:00 -0700)]
If there is only 1 simple global action, autolaunch it
Requested by UX. Also made settings available before provisioning
Bug:
14683740
Bug:
14886954
Change-Id: If62ccc6472a72b7adb4d309ee89e51069f8e0413
Torne (Richard Coles) [Wed, 14 May 2014 15:35:19 +0000 (15:35 +0000)]
am
dcc9cf03: am
41ec8c96: Merge "Avoid supported ABI list containing "unknown"."
* commit '
dcc9cf03a846cb01d91de70d7a115d95c0c4db19':
Avoid supported ABI list containing "unknown".
Torne (Richard Coles) [Wed, 14 May 2014 15:31:28 +0000 (15:31 +0000)]
am
41ec8c96: Merge "Avoid supported ABI list containing "unknown"."
* commit '
41ec8c9672fccce90a7156bcd856f59a36e93ad3':
Avoid supported ABI list containing "unknown".
Torne (Richard Coles) [Wed, 14 May 2014 15:26:04 +0000 (15:26 +0000)]
Merge "Avoid supported ABI list containing "unknown"."
Torne (Richard Coles) [Wed, 14 May 2014 15:17:26 +0000 (16:17 +0100)]
Avoid supported ABI list containing "unknown".
If one of the ABI list system properties is undefined/empty (as
ro.product.cpu.abilist64 is on a 32-bit only device), getString returns
"unknown", which ends up creating a 1-element array with "unknown" as a
member. Fix this to instead just get the empty string and split that
into a 0-element array.
Change-Id: I0d0a54eb06bb04427bcf0487e2a16d4180b81116
Deepanshu Gupta [Wed, 14 May 2014 00:36:23 +0000 (00:36 +0000)]
am
80816bfc: am
f73dbcc3: am
9916c17e: am
472cbad4: am
f57871f7: am
888dad0d: am
f33a2f62: am
f5af9a4a: am
273c5c3c: am
9ca7a039: resolved conflicts for merge of
e0be42a9 to jb-mr1.1-dev
* commit '
80816bfcaf487535a45a7e6f271341eaede653b1':
Fix build due to incorrect merges [DO NOT MERGE]
Deepanshu Gupta [Wed, 14 May 2014 00:36:20 +0000 (00:36 +0000)]
Deepanshu Gupta [Wed, 14 May 2014 00:31:20 +0000 (00:31 +0000)]
am
f73dbcc3: am
9916c17e: am
472cbad4: am
f57871f7: am
888dad0d: am
f33a2f62: am
f5af9a4a: am
273c5c3c: am
9ca7a039: resolved conflicts for merge of
e0be42a9 to jb-mr1.1-dev
* commit '
f73dbcc3780fbfb6a9eab7d43aebc3607ad1e8f8':
Fix build due to incorrect merges [DO NOT MERGE]
Deepanshu Gupta [Wed, 14 May 2014 00:31:15 +0000 (00:31 +0000)]
Deepanshu Gupta [Wed, 14 May 2014 00:26:43 +0000 (00:26 +0000)]
am
9916c17e: am
472cbad4: am
f57871f7: am
888dad0d: am
f33a2f62: am
f5af9a4a: am
273c5c3c: am
9ca7a039: resolved conflicts for merge of
e0be42a9 to jb-mr1.1-dev
* commit '
9916c17e6606607bbadacc4fb113018ecb7fcb41':
Fix build due to incorrect merges [DO NOT MERGE]
Deepanshu Gupta [Wed, 14 May 2014 00:26:38 +0000 (00:26 +0000)]
Deepanshu Gupta [Wed, 14 May 2014 00:21:36 +0000 (00:21 +0000)]
am
472cbad4: am
f57871f7: am
888dad0d: am
f33a2f62: am
f5af9a4a: am
273c5c3c: am
9ca7a039: resolved conflicts for merge of
e0be42a9 to jb-mr1.1-dev
* commit '
472cbad479b0f1361c816a2c0d5accb776fa3841':
Fix build due to incorrect merges [DO NOT MERGE]
Deepanshu Gupta [Wed, 14 May 2014 00:21:33 +0000 (00:21 +0000)]
Deepanshu Gupta [Wed, 14 May 2014 00:15:28 +0000 (00:15 +0000)]
am
f57871f7: am
888dad0d: am
f33a2f62: am
f5af9a4a: am
273c5c3c: am
9ca7a039: resolved conflicts for merge of
e0be42a9 to jb-mr1.1-dev
* commit '
f57871f799300614d37e93e376f9381fd01c2bcb':
Fix build due to incorrect merges [DO NOT MERGE]
Deepanshu Gupta [Wed, 14 May 2014 00:15:24 +0000 (00:15 +0000)]
Deepanshu Gupta [Wed, 14 May 2014 00:11:08 +0000 (00:11 +0000)]
am
888dad0d: am
f33a2f62: am
f5af9a4a: am
273c5c3c: am
9ca7a039: resolved conflicts for merge of
e0be42a9 to jb-mr1.1-dev
* commit '
888dad0df765256f4b47268400425103106894f0':
Fix build due to incorrect merges [DO NOT MERGE]
Deepanshu Gupta [Wed, 14 May 2014 00:11:06 +0000 (00:11 +0000)]
Deepanshu Gupta [Wed, 14 May 2014 00:05:38 +0000 (00:05 +0000)]
am
f33a2f62: am
f5af9a4a: am
273c5c3c: am
9ca7a039: resolved conflicts for merge of
e0be42a9 to jb-mr1.1-dev
* commit '
f33a2f62a54ef966375a7fe8706ce713386d843e':
Fix build due to incorrect merges [DO NOT MERGE]
Deepanshu Gupta [Wed, 14 May 2014 00:05:35 +0000 (00:05 +0000)]
Deepanshu Gupta [Wed, 14 May 2014 00:00:08 +0000 (00:00 +0000)]
am
f5af9a4a: am
273c5c3c: am
9ca7a039: resolved conflicts for merge of
e0be42a9 to jb-mr1.1-dev
* commit '
f5af9a4a9a0c0a3bab43235659e3adfa2cebb52f':
Fix build due to incorrect merges [DO NOT MERGE]
Deepanshu Gupta [Wed, 14 May 2014 00:00:05 +0000 (00:00 +0000)]
Deepanshu Gupta [Tue, 13 May 2014 23:55:20 +0000 (23:55 +0000)]
am
273c5c3c: am
9ca7a039: resolved conflicts for merge of
e0be42a9 to jb-mr1.1-dev
* commit '
273c5c3c4c74d29a127e614726ce2e5c5e274c20':
Fix build due to incorrect merges [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 23:55:17 +0000 (23:55 +0000)]
Deepanshu Gupta [Tue, 13 May 2014 23:54:21 +0000 (23:54 +0000)]
am
9ca7a039: resolved conflicts for merge of
e0be42a9 to jb-mr1.1-dev
* commit '
9ca7a039f73e5cf84f85282cf05d637517be2a17':
Fix build due to incorrect merges [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 23:50:44 +0000 (23:50 +0000)]
Deepanshu Gupta [Tue, 13 May 2014 23:48:31 +0000 (16:48 -0700)]
resolved conflicts for merge of
e0be42a9 to jb-mr1.1-dev
Deepanshu Gupta [Tue, 13 May 2014 23:45:30 +0000 (23:45 +0000)]
Deepanshu Gupta [Tue, 13 May 2014 23:40:37 +0000 (23:40 +0000)]
am
40bfb60e: Fix build due to incorrect merges [DO NOT MERGE]
* commit '
40bfb60efa0e92259a417a5cbfd6095759c678b7':
Fix build due to incorrect merges [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 23:40:34 +0000 (23:40 +0000)]
Justin Koh [Tue, 13 May 2014 23:24:33 +0000 (23:24 +0000)]
am
78b94de4: Set KITKAT_WATCH to be level 20, document API specific changes.
* commit '
78b94de4b527c26bb3c038ae4f8cc351b3b4881f':
Set KITKAT_WATCH to be level 20, document API specific changes.
Justin Koh [Tue, 13 May 2014 22:48:42 +0000 (15:48 -0700)]
Set KITKAT_WATCH to be level 20, document API specific changes.
Bug:
14116162
Change-Id: Iab094dbd0add414a365234c275bd473787b8803b
Deepanshu Gupta [Tue, 13 May 2014 22:52:39 +0000 (15:52 -0700)]
Fix build due to incorrect merges [DO NOT MERGE]
Change-Id: Ib3b4dafeed6ba4c07450d13d9908fb05a1a4542f
Deepanshu Gupta [Tue, 13 May 2014 22:46:28 +0000 (15:46 -0700)]
Fix build
remove a line that shouldn't have been merged into this branch.
The build will still be broken for this branch, but this will fix it for
many branches downstream.
Change-Id: I2f556636640eb823dc2834afae7b536e79b79607
Justin Koh [Tue, 13 May 2014 22:45:50 +0000 (22:45 +0000)]
am
5e6b8d37: Merge "Hide new methods in notificationlistenerservice DO NOT MERGE" into klp-modular-dev
* commit '
5e6b8d37cfdf6849890c730045f01ca5a0b4b8e8':
Hide new methods in notificationlistenerservice DO NOT MERGE
Justin Koh [Tue, 13 May 2014 22:42:46 +0000 (22:42 +0000)]
Merge "Hide new methods in notificationlistenerservice DO NOT MERGE" into klp-modular-dev
Justin Koh [Tue, 13 May 2014 22:09:28 +0000 (15:09 -0700)]
Hide new methods in notificationlistenerservice DO NOT MERGE
Hide new methods in notificationlistenerservice for now.
Bug:
14116162
Change-Id: Ib57fd2feff174ab8638bd172710873e9e2be553a
Deepanshu Gupta [Tue, 13 May 2014 21:38:02 +0000 (21:38 +0000)]
am
56a794f2: am
96e30774: am
fea4b4dd: am
3450dc32: am
06018d92: am
f41a380b: am
d10ca17d: am
8921409a: am
10fb4fe4: am
d99dd3e7: am
70efbad0: am
bd5a3e65: am
1677a9bd: Merge "resolve conflicts for merge
5a7b3b65 correctly" into jb-dev-plus-aosp
* commit '
56a794f2bf3093c9b24889e44abdcefaa976ed12':
resolve conflicts for merge
5a7b3b65 correctly
Deepanshu Gupta [Tue, 13 May 2014 21:37:58 +0000 (21:37 +0000)]
am
21dc46b1: am
569dc64c: am
69ab5946: am
fcfb8801: am
18b1525a: am
ef24a509: am
900954e3: am
2100476a: am
31a3760a: am
964023c5: am
8bf73eae: am
0ad4f2ce: resolved conflicts for merge of
7377c7be to jb-mr1-dev
* commit '
21dc46b14df9456eede9d4eb7082c85bec732058':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:37:55 +0000 (21:37 +0000)]
am
bda6d9a1: am
9a3e6ec7: am
cdc40eb0: am
6fd1703e: (-s ours) am
0d33f604: am
4dff881b: am
7b9cc710: (-s ours) am
9c7e3064: am
1b0f6056: am
c1847b54: am
5454be00: am
5dae7fda: am
9359dc2e: am
2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]
* commit '
bda6d9a15a845611e0d68acbf09787da71532287':
Support actionProviderClass attribute for menus [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:37:52 +0000 (21:37 +0000)]
am
5f421714: am
03ccc80d: am
c909b4d5: am
2322a910: am
75fc74d6: am
203964c0: am
b7e1bef1: am
b607cb82: am
27c9b568: am
e969ee5e: resolved conflicts for merge of
d388afad to jb-mr1.1-dev
* commit '
5f421714a64def639e112e0537d16b8a10829938':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:37:49 +0000 (21:37 +0000)]
am
93d10eda: am
db83a08b: am
86726f58: am
eb5b38b1: (-s ours) am
a350f96e: am
0eb268a0: am
22dabb52: (-s ours) am
c261cb0d: am
f354d01a: am
aab60856: am
ebd909cc: am
ae5e0c7b: am
4eab4e14: am
5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
* commit '
93d10eda4f4bfd6bafcffb6f3c5bea7662cd0193':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:37:46 +0000 (21:37 +0000)]
am
3d491e37: am
84cea707: am
0573cffa: am
b520cc45: am
cf2af661: am
752b90f2: am
919ce205: am
03bf747f: am
858ab06a: am
ec1b4df6: resolved conflicts for merge of
b161d6ba to jb-mr1.1-dev
* commit '
3d491e379045d571367e1eaef404393a80c5771d':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:33:14 +0000 (21:33 +0000)]
am
96e30774: am
fea4b4dd: am
3450dc32: am
06018d92: am
f41a380b: am
d10ca17d: am
8921409a: am
10fb4fe4: am
d99dd3e7: am
70efbad0: am
bd5a3e65: am
1677a9bd: Merge "resolve conflicts for merge
5a7b3b65 correctly" into jb-dev-plus-aosp
* commit '
96e30774c019e1f4400ac2d7a724ea7328bec1ac':
resolve conflicts for merge
5a7b3b65 correctly
Deepanshu Gupta [Tue, 13 May 2014 21:33:07 +0000 (21:33 +0000)]
am
569dc64c: am
69ab5946: am
fcfb8801: am
18b1525a: am
ef24a509: am
900954e3: am
2100476a: am
31a3760a: am
964023c5: am
8bf73eae: am
0ad4f2ce: resolved conflicts for merge of
7377c7be to jb-mr1-dev
* commit '
569dc64cd6b0bb7bdfec97967b192d2a706e3f81':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:33:03 +0000 (21:33 +0000)]
am
9a3e6ec7: am
cdc40eb0: am
6fd1703e: (-s ours) am
0d33f604: am
4dff881b: am
7b9cc710: (-s ours) am
9c7e3064: am
1b0f6056: am
c1847b54: am
5454be00: am
5dae7fda: am
9359dc2e: am
2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]
* commit '
9a3e6ec73c2188eb5bf1406b974dfc34e55722ad':
Support actionProviderClass attribute for menus [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:33:00 +0000 (21:33 +0000)]
am
03ccc80d: am
c909b4d5: am
2322a910: am
75fc74d6: am
203964c0: am
b7e1bef1: am
b607cb82: am
27c9b568: am
e969ee5e: resolved conflicts for merge of
d388afad to jb-mr1.1-dev
* commit '
03ccc80d0a00df9d5a4d5039941a8edfe2404868':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:32:57 +0000 (21:32 +0000)]
am
db83a08b: am
86726f58: am
eb5b38b1: (-s ours) am
a350f96e: am
0eb268a0: am
22dabb52: (-s ours) am
c261cb0d: am
f354d01a: am
aab60856: am
ebd909cc: am
ae5e0c7b: am
4eab4e14: am
5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
* commit '
db83a08b133d5c618d21ba105b0852e463cfb6d7':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:32:54 +0000 (21:32 +0000)]
am
84cea707: am
0573cffa: am
b520cc45: am
cf2af661: am
752b90f2: am
919ce205: am
03bf747f: am
858ab06a: am
ec1b4df6: resolved conflicts for merge of
b161d6ba to jb-mr1.1-dev
* commit '
84cea70792145e345d5bde8838dad14cc3e9fa4c':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:28:32 +0000 (21:28 +0000)]
am
fea4b4dd: am
3450dc32: am
06018d92: am
f41a380b: am
d10ca17d: am
8921409a: am
10fb4fe4: am
d99dd3e7: am
70efbad0: am
bd5a3e65: am
1677a9bd: Merge "resolve conflicts for merge
5a7b3b65 correctly" into jb-dev-plus-aosp
* commit '
fea4b4dde360cf5caa0fe887dbcc51a0a2329e25':
resolve conflicts for merge
5a7b3b65 correctly
Deepanshu Gupta [Tue, 13 May 2014 21:28:18 +0000 (21:28 +0000)]
am
69ab5946: am
fcfb8801: am
18b1525a: am
ef24a509: am
900954e3: am
2100476a: am
31a3760a: am
964023c5: am
8bf73eae: am
0ad4f2ce: resolved conflicts for merge of
7377c7be to jb-mr1-dev
* commit '
69ab594625e274ed4ca6d4a1dc7f8fb19d44f020':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:28:16 +0000 (21:28 +0000)]
am
cdc40eb0: am
6fd1703e: (-s ours) am
0d33f604: am
4dff881b: am
7b9cc710: (-s ours) am
9c7e3064: am
1b0f6056: am
c1847b54: am
5454be00: am
5dae7fda: am
9359dc2e: am
2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]
* commit '
cdc40eb0e02e5b7abc05a438f7fd51045ec91862':
Support actionProviderClass attribute for menus [DO NOT MERGE]
OSDN Git Service
