OSDN Git Service
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:22 +0000 (21:17 +0000)]
am
3506ac87: Doc change: Updated content for distribute.
* commit '
3506ac87c09c0748d92ef594c94365a5d7b07262':
Doc change: Updated content for distribute.
Dirk Dougherty [Fri, 21 Feb 2014 19:15:52 +0000 (11:15 -0800)]
Doc change: Updated content for distribute.
Change-Id: I612fbb8e5b7aedd73c0e633e5517bb89375760ed
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 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: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: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]
Deepanshu Gupta [Tue, 13 May 2014 21:28:14 +0000 (21:28 +0000)]
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 '
c909b4d53b7359c794f7885e99f04746646275ec':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:28:12 +0000 (21:28 +0000)]
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 '
86726f58dba0f2ee6d7e62255dbf7356a7201897':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:28:10 +0000 (21:28 +0000)]
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 '
0573cffacc4a7247151aae62d176a9e947e1dabe':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:23:50 +0000 (21:23 +0000)]
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 '
3450dc325670cc8e7855c93193cf6f59cf7be430':
resolve conflicts for merge
5a7b3b65 correctly
Deepanshu Gupta [Tue, 13 May 2014 21:23:47 +0000 (21:23 +0000)]
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 '
fcfb8801b27fd40ff27c380b8bad9b9a210effca':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:23:43 +0000 (21:23 +0000)]
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 '
6fd1703eb96669bb5c985c9de8d08107e800824c':
Support actionProviderClass attribute for menus [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:23:40 +0000 (21:23 +0000)]
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 '
2322a9107b63928529c29cabc719575692d5d934':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:23:37 +0000 (21:23 +0000)]
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 '
eb5b38b167dd5f094acc085ede494966ed0024c5':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:23:35 +0000 (21:23 +0000)]
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 '
b520cc45996de4a172147d4e934768ec6c417666':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:21:33 +0000 (21:21 +0000)]
am
883a17cd: am
14480abe: am
bfc75f68: am
11243dd6: am
9f5f450d: am
e5c518cb: am
4e8b055b: am
6dad59e1: am
85b75194: resolved conflicts for merge of
cc9e3596 to jb-mr1.1-dev
* commit '
883a17cd954c31fb7742fb415e3949623e81ba6b':
Add view cookies for action bar menus. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:18:06 +0000 (21:18 +0000)]
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 '
06018d92e8eedecc8b567f5d4c797cd8096cfffa':
resolve conflicts for merge
5a7b3b65 correctly
Deepanshu Gupta [Tue, 13 May 2014 21:18:03 +0000 (21:18 +0000)]
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 '
18b1525ac7666933befd6085461391ad1087b19a':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:18:00 +0000 (21:18 +0000)]
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 '
0d33f604d61b843a988d1bf5b9e6b421f553808b':
Support actionProviderClass attribute for menus [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:17:57 +0000 (21:17 +0000)]
am
75fc74d6: am
203964c0: am
b7e1bef1: am
b607cb82: am
27c9b568: am
e969ee5e: resolved conflicts for merge of
d388afad to jb-mr1.1-dev
* commit '
75fc74d6dbc06872d13d0db0300b530dc90bdb01':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:17:54 +0000 (21:17 +0000)]
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 '
a350f96ec97ce5ea6c61683f85f4e39fe45fa42b':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:17:51 +0000 (21:17 +0000)]
am
cf2af661: am
752b90f2: am
919ce205: am
03bf747f: am
858ab06a: am
ec1b4df6: resolved conflicts for merge of
b161d6ba to jb-mr1.1-dev
* commit '
cf2af66180e7debda36a1cece4732d0403ce37b7':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:14:56 +0000 (21:14 +0000)]
am
14480abe: am
bfc75f68: am
11243dd6: am
9f5f450d: am
e5c518cb: am
4e8b055b: am
6dad59e1: am
85b75194: resolved conflicts for merge of
cc9e3596 to jb-mr1.1-dev
* commit '
14480abeb6642d7b779d50f03e5340356a4e4b2b':
Add view cookies for action bar menus. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:12:42 +0000 (21:12 +0000)]
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 '
f41a380bd97a25bee1804e43e8deba74fa100163':
resolve conflicts for merge
5a7b3b65 correctly
Deepanshu Gupta [Tue, 13 May 2014 21:12:39 +0000 (21:12 +0000)]
am
a22e96bf: am
4e1023a1: am
89279ad1: (-s ours) am
9d3ec0be: am
48931fcc: am
a312214f: (-s ours) am
9358cf04: am
ccf6b347: am
a1546876: am
7ef27645: am
f192096a: am
17585160: am
26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE]
* commit '
a22e96bfecb933cb52a055c6f9d8f243d436b123':
Add missing layout params to xlarge action bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:12:39 +0000 (21:12 +0000)]
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 '
ef24a5091b63fb512d4ca9eb34df6394c3842d33':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:12:37 +0000 (21:12 +0000)]
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 '
4dff881b997e3e8c871068ae4b237a9e0f4ab2e7':
Support actionProviderClass attribute for menus [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:12:35 +0000 (21:12 +0000)]
am
203964c0: am
b7e1bef1: am
b607cb82: am
27c9b568: am
e969ee5e: resolved conflicts for merge of
d388afad to jb-mr1.1-dev
* commit '
203964c058857d01401c905918d0d64e83e51bab':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:12:35 +0000 (21:12 +0000)]
am
7b228464: am
ce33060c: am
563d0ee7: am
04f0cb6e: am
34aa1bd3: am
54b946fe: am
f46900c5: am
87a54055: am
5878115a: resolved conflicts for merge of
9978c036 to jb-mr1.1-dev
* commit '
7b22846433508139f466c66cfa78d94bbec3582e':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:12:32 +0000 (21:12 +0000)]
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 '
0eb268a0de02b73dd23ab2e672c35a2650a9eea4':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:12:29 +0000 (21:12 +0000)]
am
752b90f2: am
919ce205: am
03bf747f: am
858ab06a: am
ec1b4df6: resolved conflicts for merge of
b161d6ba to jb-mr1.1-dev
* commit '
752b90f2605956e0de880c2a406dc887aeb3d8c2':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:09:22 +0000 (21:09 +0000)]
am
bfc75f68: am
11243dd6: am
9f5f450d: am
e5c518cb: am
4e8b055b: am
6dad59e1: am
85b75194: resolved conflicts for merge of
cc9e3596 to jb-mr1.1-dev
* commit '
bfc75f6895171aeac68f2506fd318a3eb5d4b9e4':
Add view cookies for action bar menus. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:07:45 +0000 (21:07 +0000)]
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 '
d10ca17d6feefd449595df1cb11d161c8f10dd57':
resolve conflicts for merge
5a7b3b65 correctly
Deepanshu Gupta [Tue, 13 May 2014 21:07:40 +0000 (21:07 +0000)]
am
900954e3: am
2100476a: am
31a3760a: am
964023c5: am
8bf73eae: am
0ad4f2ce: resolved conflicts for merge of
7377c7be to jb-mr1-dev
* commit '
900954e3cd135bf43db975961056e7661f26a6c6':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:07:38 +0000 (21:07 +0000)]
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 '
7b9cc71063869a98f35b49c2e072750dfa46e0b9':
Support actionProviderClass attribute for menus [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:07:35 +0000 (21:07 +0000)]
am
b7e1bef1: am
b607cb82: am
27c9b568: am
e969ee5e: resolved conflicts for merge of
d388afad to jb-mr1.1-dev
* commit '
b7e1bef1835bdb224d6ed09c3c219662e1db1f56':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:07:35 +0000 (21:07 +0000)]
am
9d0fcb73: am
9cc952e7: am
b7b64cc4: am
e0105901: am
52b49665: am
eff94bc3: am
8c19c6a1: am
16f3a616: am
c0e9c66d: resolved conflicts for merge of
8e015b7b to jb-mr1.1-dev
* commit '
9d0fcb73e23beb5baa62cb8e5b428e5f0ef7a571':
Action bar rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:07:31 +0000 (21:07 +0000)]
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 '
22dabb52820d81744f46d009a27bf9294928bbee':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:07:28 +0000 (21:07 +0000)]
am
919ce205: am
03bf747f: am
858ab06a: am
ec1b4df6: resolved conflicts for merge of
b161d6ba to jb-mr1.1-dev
* commit '
919ce2051595dfa5dd047660946038d23fa688f4':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:07:01 +0000 (21:07 +0000)]
am
4e1023a1: am
89279ad1: (-s ours) am
9d3ec0be: am
48931fcc: am
a312214f: (-s ours) am
9358cf04: am
ccf6b347: am
a1546876: am
7ef27645: am
f192096a: am
17585160: am
26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE]
* commit '
4e1023a1fccc06f382a976a94bcb29c3764183f5':
Add missing layout params to xlarge action bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:06:58 +0000 (21:06 +0000)]
am
ce33060c: am
563d0ee7: am
04f0cb6e: am
34aa1bd3: am
54b946fe: am
f46900c5: am
87a54055: am
5878115a: resolved conflicts for merge of
9978c036 to jb-mr1.1-dev
* commit '
ce33060c92a8e0d739f020b6227f2ee6007724fe':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:04:28 +0000 (21:04 +0000)]
am
11243dd6: am
9f5f450d: am
e5c518cb: am
4e8b055b: am
6dad59e1: am
85b75194: resolved conflicts for merge of
cc9e3596 to jb-mr1.1-dev
* commit '
11243dd66484d0f99f56454491d5d82acfca6070':
Add view cookies for action bar menus. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:02:23 +0000 (21:02 +0000)]
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 '
8921409a05c0e52ba453d3c4f37a9506fde9b321':
resolve conflicts for merge
5a7b3b65 correctly
Deepanshu Gupta [Tue, 13 May 2014 21:02:23 +0000 (21:02 +0000)]
am
89279ad1: (-s ours) am
9d3ec0be: am
48931fcc: am
a312214f: (-s ours) am
9358cf04: am
ccf6b347: am
a1546876: am
7ef27645: am
f192096a: am
17585160: am
26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE]
* commit '
89279ad140a30e5d134d6d948c4c6d835b5ca5b3':
Add missing layout params to xlarge action bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:02:19 +0000 (21:02 +0000)]
am
2100476a: am
31a3760a: am
964023c5: am
8bf73eae: am
0ad4f2ce: resolved conflicts for merge of
7377c7be to jb-mr1-dev
* commit '
2100476ace68858bc7b7356b33aa525e38795592':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:02:19 +0000 (21:02 +0000)]
am
563d0ee7: am
04f0cb6e: am
34aa1bd3: am
54b946fe: am
f46900c5: am
87a54055: am
5878115a: resolved conflicts for merge of
9978c036 to jb-mr1.1-dev
* commit '
563d0ee7d48df767c2d4da127f1224140fa65cfd':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:02:17 +0000 (21:02 +0000)]
am
9c7e3064: am
1b0f6056: am
c1847b54: am
5454be00: am
5dae7fda: am
9359dc2e: am
2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]
* commit '
9c7e3064469e51a10503cfdf3d0215a62a3b6c8d':
Support actionProviderClass attribute for menus [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:02:14 +0000 (21:02 +0000)]
am
b607cb82: am
27c9b568: am
e969ee5e: resolved conflicts for merge of
d388afad to jb-mr1.1-dev
* commit '
b607cb82e0883a755fa6c6f9f5ec573cd79a731b':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:02:11 +0000 (21:02 +0000)]
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 '
c261cb0dcd2ea4ca35dbef1973c0a08709ce5ae1':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:02:08 +0000 (21:02 +0000)]
am
03bf747f: am
858ab06a: am
ec1b4df6: resolved conflicts for merge of
b161d6ba to jb-mr1.1-dev
* commit '
03bf747fec291b355af531bf0b04a2b1669bf92e':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:02:06 +0000 (21:02 +0000)]
am
9cc952e7: am
b7b64cc4: am
e0105901: am
52b49665: am
eff94bc3: am
8c19c6a1: am
16f3a616: am
c0e9c66d: resolved conflicts for merge of
8e015b7b to jb-mr1.1-dev
* commit '
9cc952e74a8f82b85a9bd8cbd7cbfb286c9b65d6':
Action bar rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:00:22 +0000 (21:00 +0000)]
am
10fb4fe4: am
d99dd3e7: am
70efbad0: am
bd5a3e65: am
1677a9bd: Merge "resolve conflicts for merge
5a7b3b65 correctly" into jb-dev-plus-aosp
* commit '
10fb4fe400625a95b3bc00b10b92814d7bc6f118':
resolve conflicts for merge
5a7b3b65 correctly
Deepanshu Gupta [Tue, 13 May 2014 21:00:19 +0000 (21:00 +0000)]
am
31a3760a: am
964023c5: am
8bf73eae: am
0ad4f2ce: resolved conflicts for merge of
7377c7be to jb-mr1-dev
* commit '
31a3760a49f7495e73f4de1c11f2e3f64ff9a7ff':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:00:16 +0000 (21:00 +0000)]
am
1b0f6056: am
c1847b54: am
5454be00: am
5dae7fda: am
9359dc2e: am
2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]
* commit '
1b0f605667dc286b1a1f423b43c4b6957993daaf':
Support actionProviderClass attribute for menus [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 21:00:13 +0000 (21:00 +0000)]
am
27c9b568: am
e969ee5e: resolved conflicts for merge of
d388afad to jb-mr1.1-dev
* commit '
27c9b568ed6b24f68aeee0f2a1d7b3fa83bcc056':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:59:25 +0000 (20:59 +0000)]
am
9f5f450d: am
e5c518cb: am
4e8b055b: am
6dad59e1: am
85b75194: resolved conflicts for merge of
cc9e3596 to jb-mr1.1-dev
* commit '
9f5f450dca41bcea94b2abae1c782a84c0387f6d':
Add view cookies for action bar menus. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:58:36 +0000 (20:58 +0000)]
am
9d3ec0be: am
48931fcc: am
a312214f: (-s ours) am
9358cf04: am
ccf6b347: am
a1546876: am
7ef27645: am
f192096a: am
17585160: am
26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE]
* commit '
9d3ec0be302acf9f29d0fb2be644841d71ed5e63':
Add missing layout params to xlarge action bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:58:33 +0000 (20:58 +0000)]
am
04f0cb6e: am
34aa1bd3: am
54b946fe: am
f46900c5: am
87a54055: am
5878115a: resolved conflicts for merge of
9978c036 to jb-mr1.1-dev
* commit '
04f0cb6e958cc1529e3be04ef454a35f416d9667':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:57:20 +0000 (20:57 +0000)]
am
b7b64cc4: am
e0105901: am
52b49665: am
eff94bc3: am
8c19c6a1: am
16f3a616: am
c0e9c66d: resolved conflicts for merge of
8e015b7b to jb-mr1.1-dev
* commit '
b7b64cc4884e933d0da4664ce7195caa5003ef65':
Action bar rendering in layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:56:33 +0000 (20:56 +0000)]
am
f354d01a: am
aab60856: am
ebd909cc: am
ae5e0c7b: am
4eab4e14: am
5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
* commit '
f354d01afde602034e3d531eb7cbfe5fa5c48a21':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:56:31 +0000 (20:56 +0000)]
am
858ab06a: am
ec1b4df6: resolved conflicts for merge of
b161d6ba to jb-mr1.1-dev
* commit '
858ab06a38769aaa05a4b87a600739c9294b382d':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:56:07 +0000 (20:56 +0000)]
am
d99dd3e7: am
70efbad0: am
bd5a3e65: am
1677a9bd: Merge "resolve conflicts for merge
5a7b3b65 correctly" into jb-dev-plus-aosp
* commit '
d99dd3e7322fa0071ca709e71ab34ae54677e3dc':
resolve conflicts for merge
5a7b3b65 correctly
Deepanshu Gupta [Tue, 13 May 2014 20:56:04 +0000 (20:56 +0000)]
am
964023c5: am
8bf73eae: am
0ad4f2ce: resolved conflicts for merge of
7377c7be to jb-mr1-dev
* commit '
964023c5dcd0334cdcf624eff26d791d9c9617a8':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:56:01 +0000 (20:56 +0000)]
am
c1847b54: am
5454be00: am
5dae7fda: am
9359dc2e: am
2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE]
* commit '
c1847b54a391857f0871a15e97fbaae0fef0ff33':
Support actionProviderClass attribute for menus [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:55:59 +0000 (20:55 +0000)]
am
e969ee5e: resolved conflicts for merge of
d388afad to jb-mr1.1-dev
* commit '
e969ee5e5ddc112df4759b308e3e1eafc9cbcf84':
Add special system view cookie to OverflowButton. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:54:20 +0000 (20:54 +0000)]
am
e5c518cb: am
4e8b055b: am
6dad59e1: am
85b75194: resolved conflicts for merge of
cc9e3596 to jb-mr1.1-dev
* commit '
e5c518cbd0544a44bae8cb2a0b90d18bb91c5b8a':
Add view cookies for action bar menus. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 20:54:14 +0000 (20:54 +0000)]
am
70efbad0: am
bd5a3e65: am
1677a9bd: Merge "resolve conflicts for merge
5a7b3b65 correctly" into jb-dev-plus-aosp
* commit '
70efbad0648eb96e9becbd0529cc1f34b6ffb986':
resolve conflicts for merge
5a7b3b65 correctly
OSDN Git Service
