drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
135,340 Commits 1 Branch 0 Tags
Commit Graph

135340 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
dcf080d571 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
 2014-05-13 21:38:02 +00:00
Deepanshu Gupta
465a99260e 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]
 2014-05-13 21:37:58 +00:00
Deepanshu Gupta
83dcd3f97f 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]
 2014-05-13 21:37:55 +00:00
Deepanshu Gupta
55f0c87435 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]
 2014-05-13 21:37:52 +00:00
Deepanshu Gupta
4f9bb37759 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]
 2014-05-13 21:37:49 +00:00
Deepanshu Gupta
8fdd8f6576 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]
 2014-05-13 21:37:46 +00:00
Deepanshu Gupta
56a794f2bf 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
 2014-05-13 21:33:14 +00:00
Deepanshu Gupta
21dc46b14d 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]
 2014-05-13 21:33:07 +00:00
Deepanshu Gupta
bda6d9a15a 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]
 2014-05-13 21:33:03 +00:00
Deepanshu Gupta
5f421714a6 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]
 2014-05-13 21:33:00 +00:00
Deepanshu Gupta
93d10eda4f 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]
 2014-05-13 21:32:57 +00:00
Deepanshu Gupta
3d491e3790 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]
 2014-05-13 21:32:54 +00:00
Deepanshu Gupta
9dad1cff17 am f14922db: am 6368a39d: 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 'f14922db63c866eee3f3eda63c57e08955fa27cb':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 21:32:53 +00:00
Deepanshu Gupta
96e30774c0 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
 2014-05-13 21:28:32 +00:00
Deepanshu Gupta
569dc64cd6 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]
 2014-05-13 21:28:18 +00:00
Deepanshu Gupta
9a3e6ec73c 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]
 2014-05-13 21:28:16 +00:00
Deepanshu Gupta
03ccc80d0a 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]
 2014-05-13 21:28:14 +00:00
Deepanshu Gupta
db83a08b13 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]
 2014-05-13 21:28:12 +00:00
Deepanshu Gupta
84cea70792 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]
 2014-05-13 21:28:10 +00:00
Deepanshu Gupta
f14922db63 am 6368a39d: 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 '6368a39dd2b57907a47b7a1693de1c7744a0a39c':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 21:26:33 +00:00
Deepanshu Gupta
425f172ab5 am ae089999: am ef33848a: 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 N 
* commit 'ae089999befdff1382266d11ac5fd3cc1e9270ae':
  Add missing layout params to xlarge action bar. [DO NOT MERGE]
 2014-05-13 21:25:04 +00:00
Deepanshu Gupta
a6bc2e68b7 am 52483b6d: am 110e3f48: 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 '52483b6d398fa42b8ad9876f0fbebc8ed89ad579':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 21:25:00 +00:00
Deepanshu Gupta
fea4b4dde3 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
 2014-05-13 21:23:50 +00:00
Deepanshu Gupta
69ab594625 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]
 2014-05-13 21:23:47 +00:00
Deepanshu Gupta
cdc40eb0e0 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]
 2014-05-13 21:23:43 +00:00
Deepanshu Gupta
c909b4d53b 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]
 2014-05-13 21:23:40 +00:00
Deepanshu Gupta
86726f58db 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]
 2014-05-13 21:23:37 +00:00
Deepanshu Gupta
0573cffacc 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]
 2014-05-13 21:23:35 +00:00
Svetoslav
04533dd3ba Teach print manager services about user profiles. 
For user profiles the printing layer will have a separate state and
set a set of print plugins. The rationale behind this is that if a user
uses different profiles for different domains he would expect that
each domain is separate as domains may have different security and
privacy requirements.

bug:14567366

Change-Id: I461ae4636294fa8968785295afb952aeb14a13b5
 2014-05-13 21:21:36 +00:00
Deepanshu Gupta
6368a39dd2 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]
 2014-05-13 21:21:33 +00:00
Deepanshu Gupta
ae089999be am ef33848a: 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 'ef33848aae9c482b43087ae4e326e0a40e7474f2':
  Add missing layout params to xlarge action bar. [DO NOT MERGE]
 2014-05-13 21:19:10 +00:00
Deepanshu Gupta
52483b6d39 am 110e3f48: 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 '110e3f48f3f58a5178676112eb8c2693c62c640f':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 21:19:07 +00:00
Deepanshu Gupta
3450dc3256 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
 2014-05-13 21:18:06 +00:00
Deepanshu Gupta
fcfb8801b2 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]
 2014-05-13 21:18:03 +00:00
Deepanshu Gupta
6fd1703eb9 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]
 2014-05-13 21:18:00 +00:00
Deepanshu Gupta
2322a9107b 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]
 2014-05-13 21:17:57 +00:00
Deepanshu Gupta
eb5b38b167 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]
 2014-05-13 21:17:54 +00:00
Deepanshu Gupta
b520cc4599 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]
 2014-05-13 21:17:51 +00:00
Deepanshu Gupta
b09506dad9 am ecf80ad3: am 0efb0759: 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 'ecf80ad35c15b96ef11034716a73bc607011e1bd':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 21:17:25 +00:00
Deepanshu Gupta
883a17cd95 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]
 2014-05-13 21:14:56 +00:00
Deepanshu Gupta
06018d92e8 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
 2014-05-13 21:12:42 +00:00
Deepanshu Gupta
ef33848aae 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]
 2014-05-13 21:12:39 +00:00
Deepanshu Gupta
18b1525ac7 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]
 2014-05-13 21:12:39 +00:00
Deepanshu Gupta
0d33f604d6 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]
 2014-05-13 21:12:37 +00:00
Deepanshu Gupta
110e3f48f3 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]
 2014-05-13 21:12:35 +00:00
Deepanshu Gupta
75fc74d6db 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]
 2014-05-13 21:12:35 +00:00
Deepanshu Gupta
a350f96ec9 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]
 2014-05-13 21:12:32 +00:00
Deepanshu Gupta
cf2af66180 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]
 2014-05-13 21:12:29 +00:00
Deepanshu Gupta
ecf80ad35c am 0efb0759: 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 '0efb07592a6a2fa0ecfe41fa617c99dfe4a45348':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 21:11:51 +00:00
Deepanshu Gupta
14480abeb6 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]
 2014-05-13 21:09:22 +00:00