git.osdn.net Git - android-x86/frameworks-base.git/log

Deepanshu Gupta [Tue, 13 May 2014 18:14:11 +0000 (18:14 +0000)]

am fd8af673: (-s ours) am 9e614b25: am 204316c5: am 8cf3343d: am 838e5482: am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]

* commit 'fd8af673020786080a9aeddf39383233f5f0d8f0':
Fix NPE in layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:14:09 +0000 (18:14 +0000)]

am be0c94ea: (-s ours) am be2184e4: am cfc9e4ed: am d62dcc29: am df8a15b3: am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE]

* commit 'be0c94ea6b6867948a074476cf39a1c4b04c55ff':
Fix text size in Fake Action Bar. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:14:06 +0000 (18:14 +0000)]

am dbfd29d8: am 81ff5ba7: am 72e3fc1d: am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev

* commit 'dbfd29d85503b4a9e4a75ae74186623705749bac':
Remove references to non-std Java classes. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:09:06 +0000 (18:09 +0000)]

am 9e614b25: am 204316c5: am 8cf3343d: am 838e5482: am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]

* commit '9e614b25db75950d6b08f937f15c0bc0df74803f':
Fix NPE in layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:09:02 +0000 (18:09 +0000)]

am be2184e4: am cfc9e4ed: am d62dcc29: am df8a15b3: am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE]

* commit 'be2184e425bae9212d81fd90e4d7cc4f67ca9d0e':
Fix text size in Fake Action Bar. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:08:59 +0000 (18:08 +0000)]

am 81ff5ba7: am 72e3fc1d: am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev

* commit '81ff5ba73f5c5c098cf4d2f46f360852bccf63da':
Remove references to non-std Java classes. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:03:41 +0000 (18:03 +0000)]

am 204316c5: am 8cf3343d: am 838e5482: am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]

* commit '204316c5ac8b605a2389d898dfdf5d6a897b6f4d':
Fix NPE in layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:03:38 +0000 (18:03 +0000)]

am cfc9e4ed: am d62dcc29: am df8a15b3: am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE]

* commit 'cfc9e4ed5df8c1bc9280d48b855fc48c54927064':
Fix text size in Fake Action Bar. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:03:36 +0000 (18:03 +0000)]

am 72e3fc1d: am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev

* commit '72e3fc1d37d38fcc09134be786e0f64a174a6ece':
Remove references to non-std Java classes. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 18:01:00 +0000 (18:01 +0000)]

am 74503f66: am 0c98ce5a: am f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev

* commit '74503f66e0cb5a4ea617c4a66882e8c33e5cc888':
Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:57:56 +0000 (17:57 +0000)]

am 8cf3343d: am 838e5482: am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]

* commit '8cf3343dc3e174f2459c21a1f75cf869c36f02c2':
Fix NPE in layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:57:52 +0000 (17:57 +0000)]

am d62dcc29: am df8a15b3: am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE]

* commit 'd62dcc2958b75ec855f93f2b116ce47b1c5d8ecf':
Fix text size in Fake Action Bar. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:57:41 +0000 (17:57 +0000)]

am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev

* commit '6f58831c64d01df7e0a80bcb47b54ea7a53a2e14':
Remove references to non-std Java classes. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:56:55 +0000 (17:56 +0000)]

am 0c98ce5a: am f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev

* commit '0c98ce5a08e7ee5343f58fe9afe56c8a9b9fb75e':
Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:54:26 +0000 (17:54 +0000)]

am 838e5482: am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]

* commit '838e54826bbb03cec41684340c63be993d2dc160':
Fix NPE in layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:54:23 +0000 (17:54 +0000)]

am df8a15b3: am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE]

* commit 'df8a15b31ec4c72042f80a90365867939bddffd1':
Fix text size in Fake Action Bar. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:51:28 +0000 (10:51 -0700)]

resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:49:56 +0000 (17:49 +0000)]

am f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev

* commit 'f75f33d33be9704a09de3de967c24ecb376ca4fb':
Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:44:40 +0000 (17:44 +0000)]

am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev

* commit 'dd8ebf1e15ffa78785307698551357fe80ea3775':
Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:29:22 +0000 (17:29 +0000)]

am 0b2f4a18: (-s ours) am 20bec39e: am f1517cc9: am 69bae787: am 2c167d0f: am 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

* commit '0b2f4a18cc1c38d04d2efc7b47762a312d99c987':
Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:29:13 +0000 (17:29 +0000)]

am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev

* commit 'c70ce72a986f029c9f8c43b4060001624176068d':
Fix CalendarView to show the right labels. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:24:13 +0000 (17:24 +0000)]

am 20bec39e: am f1517cc9: am 69bae787: am 2c167d0f: am 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

* commit '20bec39e3f72d198f06b6b0d4a7ac40f52dc2c0e':
Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:24:10 +0000 (17:24 +0000)]

am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev

* commit 'af9fde9680922f072981a4853e37ccfcf974920a':
Fix CalendarView to show the right labels. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:23:22 +0000 (10:23 -0700)]

resolved conflicts for merge of 520f585b to jb-mr1.1-dev

Change-Id: I3982d8cd6585e6d4a3a9cf5b1d78f01f0e4ced6b

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:18:58 +0000 (17:18 +0000)]

am f1517cc9: am 69bae787: am 2c167d0f: am 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

* commit 'f1517cc999cbbac99f7299d06ea4ffc4329b0b9f':
Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:18:55 +0000 (17:18 +0000)]

am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev

* commit '425addb94428d6f17658256a4acd4b62189c8844':
Fix CalendarView to show the right labels. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:14:10 +0000 (17:14 +0000)]

am 69bae787: am 2c167d0f: am 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

* commit '69bae78787a01b2fe4f2ba8e3c388c31f0989cb4':
Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:14:07 +0000 (17:14 +0000)]

am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev

* commit 'a43aaf00b583e8a88681cdcc6ebe1ae2c52f6f20':
Fix CalendarView to show the right labels. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 17:12:27 +0000 (17:12 +0000)]

am 2c167d0f: am 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

* commit '2c167d0f6a370f9272ef24746222772586c1758c':
Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:49:18 +0000 (09:49 -0700)]

resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev

Change-Id: I4ab1b0a71b99692458efc3a67c8a8da3690afb7b

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:46:48 +0000 (16:46 +0000)]

am 0cbfde12: am 40b54563: am 07f8da65: am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev

* commit '0cbfde12fde85713f87d8c5ac0cc137c143dfd27':
Fix layoutlib [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:41:50 +0000 (16:41 +0000)]

am 40b54563: am 07f8da65: am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev

* commit '40b54563743c3bab92ee7086f8a2b159ecef5453':
Fix layoutlib [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:36:38 +0000 (16:36 +0000)]

am 07f8da65: am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev

* commit '07f8da65e231142e6915d9aa7853dd4d772112a0':
Fix layoutlib [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:36:33 +0000 (16:36 +0000)]

am 94d33cfc: am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]

* commit '94d33cfce1f32af4480f941fdd6c9942bb203d2c':
Fix NPE in layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:36:30 +0000 (16:36 +0000)]

am d4e6727d: am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE]

* commit 'd4e6727d02f7507fdfd6cbbabd03d6e922127e4b':
Fix text size in Fake Action Bar. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:36:28 +0000 (16:36 +0000)]

am ed98abec: am 8a70bcef: resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aosp

* commit 'ed98abecad359ab1765ac1f698c8ba06dbd00745':
Remove references to non-std Java classes. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:36:25 +0000 (16:36 +0000)]

am 2cbe100a: am 40fea8b1: am 4b5da86d: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]

* commit '2cbe100a9bc6d2b3bf828432a1527f0ac239e575':
Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:36:22 +0000 (16:36 +0000)]

am 632c9e2d: am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

* commit '632c9e2dabc44b24f04c3418e4a3540b22db792b':
Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:31:35 +0000 (16:31 +0000)]

am 82d5bd98: am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]

* commit '82d5bd98b77a9955e375b075e262639625c40232':
Fix NPE in layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:31:31 +0000 (16:31 +0000)]

am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE]

* commit 'd5de1bd6305dc8885027504996602755b1e79099':
Fix text size in Fake Action Bar. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:31:28 +0000 (16:31 +0000)]

am 8a70bcef: resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aosp

* commit '8a70bcef5a724906e3c35c58cb2266ee9c9e1b78':
Remove references to non-std Java classes. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:31:23 +0000 (16:31 +0000)]

am 40fea8b1: am 4b5da86d: Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]

* commit '40fea8b1bf689933e63941b5fa5e3379f82c88b5':
Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:31:20 +0000 (16:31 +0000)]

am 065ce2e8: am 5c166c9c: Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

* commit '065ce2e8b3e11ff8bb1699748edbd23d272bc8a6':
Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:31:05 +0000 (16:31 +0000)]

am 2fb139e0: resolved conflicts for merge of 9f2f5e77 to jb-mr1-dev

* commit '2fb139e02c1e9d2d7c92acf813445a063e73d94f':
Fix CalendarView to show the right labels. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 16:31:02 +0000 (16:31 +0000)]

am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev

* commit '888461c801b531f31b2ef34617d333d781d93010':
Fix layoutlib [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:27:24 +0000 (02:27 +0000)]

am b5b4d6eb: (-s ours) am a7c0d02a: am 0e50f1c2: am 5e8b02db: am 42556c39: am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]

* commit 'b5b4d6eb790ec344680f92f75edd75c427058266':
Fix ClassCastException when rendering ListView [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:27:21 +0000 (02:27 +0000)]

am 977ede48: (-s ours) am 51ce58a7: am 37f43311: am 9887703d: am 202800b1: am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE]

* commit '977ede48a26e9c1a9f5f840448edadd89255b161':
Add orientation to configuration for layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:21:57 +0000 (02:21 +0000)]

am a7c0d02a: am 0e50f1c2: am 5e8b02db: am 42556c39: am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]

* commit 'a7c0d02ad6b161b5084abc8a2740f7e783d4ad1e':
Fix ClassCastException when rendering ListView [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:21:54 +0000 (02:21 +0000)]

am 51ce58a7: am 37f43311: am 9887703d: am 202800b1: am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE]

* commit '51ce58a7bb2798c2aac1f5a1d76deaeab27e21da':
Add orientation to configuration for layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:19:49 +0000 (02:19 +0000)]

am e5a2347b: Fix NPE in layoutlib. [DO NOT MERGE]

* commit 'e5a2347bc6cf1506799136af4c9724275ca0247e':
Fix NPE in layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:19:46 +0000 (02:19 +0000)]

am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE]

* commit '30505abeb6cda9d042ec41f2563d561714eac46b':
Fix text size in Fake Action Bar. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:16:50 +0000 (02:16 +0000)]

am 0e50f1c2: am 5e8b02db: am 42556c39: am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]

* commit '0e50f1c2ca92c060e88a645d5607b47db9728ccc':
Fix ClassCastException when rendering ListView [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:16:48 +0000 (02:16 +0000)]

am 37f43311: am 9887703d: am 202800b1: am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE]

* commit '37f43311e1f25581de365b5733c0148c958554e5':
Add orientation to configuration for layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:16:26 +0000 (19:16 -0700)]

resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev

Change-Id: I16a4ce0863576cca07b1753f0ad56d6e97015c78

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:12:15 +0000 (02:12 +0000)]

am 5e8b02db: am 42556c39: am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]

* commit '5e8b02dbafc3e097a43230f881bd289e207f7bfe':
Fix ClassCastException when rendering ListView [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:12:12 +0000 (02:12 +0000)]

am 9887703d: am 202800b1: am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE]

* commit '9887703df219e9f2dac4714fbdb4dc34ac56d2c4':
Add orientation to configuration for layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:07:28 +0000 (02:07 +0000)]

am 42556c39: am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]

* commit '42556c394b1f7bf53f59aa6905dc0d20fe495389':
Fix ClassCastException when rendering ListView [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:07:25 +0000 (02:07 +0000)]

am 202800b1: am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE]

* commit '202800b12d7bbfd719da1c5fa50f646188312e97':
Add orientation to configuration for layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:04:58 +0000 (02:04 +0000)]

am 018da2e9: (-s ours) am 1ba310ca: am efa5ffc8: am 90ce58ec: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

* commit '018da2e9200323356c4dbe3e35cf906c73adda34':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:04:55 +0000 (02:04 +0000)]

am 06a87027: (-s ours) am 995c4d51: am b7bafba7: am 099f40a9: Support actionProviderClass attribute for menus [DO NOT MERGE]

* commit '06a8702729309fa8eb5977142b26b8d8d0d6df7b':
Support actionProviderClass attribute for menus [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:04:52 +0000 (02:04 +0000)]

am 70b2be8e: (-s ours) am 59a0f746: am 51dd8878: am 60b52ee9: Fix class name for OverflowMenuButton [DO NOT MERGE]

* commit '70b2be8e0d9aecd1215210b9e253680192e486bc':
Fix class name for OverflowMenuButton [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:04:49 +0000 (02:04 +0000)]

am 0fef2d24: (-s ours) am a51ac1bd: am 503aaa48: am 7c6f6481: Add special system view cookie to OverflowButton. [DO NOT MERGE]

* commit '0fef2d24c0147597c4853fa070f997f794dd6158':
Add special system view cookie to OverflowButton. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:04:46 +0000 (02:04 +0000)]

am c7a27371: (-s ours) am 09a42524: am 30db282f: am 22de7c4c: Fix style warnings in RenderSessionImpl [DO NOT MERGE]

* commit 'c7a27371235b70cd466a71042f12964ed75d075f':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:04:43 +0000 (02:04 +0000)]

am 6f6989f3: (-s ours) am 80f2914b: am b67b1b45: am 094fd8ec: Add view cookies for action bar menus. [DO NOT MERGE]

* commit '6f6989f3532b0022c8ebed59dbd9e4fdc5362978':
Add view cookies for action bar menus. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:04:41 +0000 (02:04 +0000)]

am 6c600df6: (-s ours) am e686fbce: am 2c8fea2a: am 56759be8: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]

* commit '6c600df67388706d24486022fa73ed8786119faf':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:04:38 +0000 (02:04 +0000)]

am e7c3ed44: (-s ours) am 21404483: am 0bb06b91: am fe38489f: Action bar rendering in layoutlib [DO NOT MERGE]

* commit 'e7c3ed442753c0ada27450868adcf1ff98fe9c39':
Action bar rendering in layoutlib [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:04:35 +0000 (02:04 +0000)]

am c88d4c57: (-s ours) am b172b780: am f3264738: am cc5340bc: Add missing dependency in layoutlib build file [DO NOT MERGE]

* commit 'c88d4c572f95a6b2397cd2c2931b1a51c673a3c8':
Add missing dependency in layoutlib build file [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:04:31 +0000 (02:04 +0000)]

am 57c0cf45: (-s ours) am 71acfa6c: am 49d47a02: am 76dccb7f: Fix theme/style resolution in Layoutlib [DO NOT MERGE]

* commit '57c0cf454ab8d8d321f2a10c4914eb4414722392':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:04:29 +0000 (02:04 +0000)]

am 3195ff0a: (-s ours) am b90db3e6: am de3b2c06: am 1ed75bde: Remove references to non-std Java classes. [DO NOT MERGE]

* commit '3195ff0afad61fbb0787b80023bdb22ece4ecb6f':
Remove references to non-std Java classes. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:04:25 +0000 (02:04 +0000)]

am 4654bfc1: (-s ours) am c2a6f3b1: am 2f94c1db: am 6136af32: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]

* commit '4654bfc14ce664e6a6247ffa0fdace17f3eeb964':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:04:22 +0000 (02:04 +0000)]

am 863b49cc: (-s ours) am 9b89fcc0: am ef9596a1: am 2bd65db1: Layoutlib tests now check methods return value [DO NOT MERGE]

* commit '863b49ccaa77c7b0960220fca158099f3a79cb6a':
Layoutlib tests now check methods return value [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:02:56 +0000 (02:02 +0000)]

am f20c9c66: am 06c4f23d: am 64dc0380: Fix layoutlib [DO NOT MERGE]

* commit 'f20c9c660edcce0fe90ba5f8464f726dcd51229e':
Fix layoutlib [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:02:54 +0000 (02:02 +0000)]

am 3990ec34: am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]

* commit '3990ec3490cc43a2690163f2a973b5ac6c4bdc46':
Fix ClassCastException when rendering ListView [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:02:50 +0000 (02:02 +0000)]

am 4d69ca22: am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE]

* commit '4d69ca223b268d4ed93baf9d3c354e1df79d55ce':
Add orientation to configuration for layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:01:41 +0000 (19:01 -0700)]

resolved conflicts for merge of 9f2f5e77 to jb-mr1-dev

Change-Id: Id8cb5e2e9d0c41bdaf767563ebd6e3951ae68a3c

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:00:33 +0000 (02:00 +0000)]

am 1ba310ca: am efa5ffc8: am 90ce58ec: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

* commit '1ba310ca02eeba9281c244851e27f4fbbf3c81d6':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:00:29 +0000 (02:00 +0000)]

am 995c4d51: am b7bafba7: am 099f40a9: Support actionProviderClass attribute for menus [DO NOT MERGE]

* commit '995c4d51532dcd4f556e352f273396a70cea88e2':
Support actionProviderClass attribute for menus [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:00:26 +0000 (02:00 +0000)]

am 59a0f746: am 51dd8878: am 60b52ee9: Fix class name for OverflowMenuButton [DO NOT MERGE]

* commit '59a0f746eb9de9086048419a5aec3dedc7ec9d94':
Fix class name for OverflowMenuButton [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:00:23 +0000 (02:00 +0000)]

am a51ac1bd: am 503aaa48: am 7c6f6481: Add special system view cookie to OverflowButton. [DO NOT MERGE]

* commit 'a51ac1bd065904ba7102d1b1565b4a47d7cbcb4a':
Add special system view cookie to OverflowButton. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:00:20 +0000 (02:00 +0000)]

am 09a42524: am 30db282f: am 22de7c4c: Fix style warnings in RenderSessionImpl [DO NOT MERGE]

* commit '09a42524dd693a68517b9827e3d7df77c6bbf537':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:00:17 +0000 (02:00 +0000)]

am 80f2914b: am b67b1b45: am 094fd8ec: Add view cookies for action bar menus. [DO NOT MERGE]

* commit '80f2914b4b12340ff590882125789144d4f00ce0':
Add view cookies for action bar menus. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:00:14 +0000 (02:00 +0000)]

am e686fbce: am 2c8fea2a: am 56759be8: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]

* commit 'e686fbced9271cc7e35f4b17c7cd1b43d118ce0f':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:00:11 +0000 (02:00 +0000)]

am 21404483: am 0bb06b91: am fe38489f: Action bar rendering in layoutlib [DO NOT MERGE]

* commit '21404483adbd4f26b5a2c7ebee7c09e83f42607e':
Action bar rendering in layoutlib [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:00:08 +0000 (02:00 +0000)]

am b172b780: am f3264738: am cc5340bc: Add missing dependency in layoutlib build file [DO NOT MERGE]

* commit 'b172b7805160d4a6875d694cb218fe05b117beb3':
Add missing dependency in layoutlib build file [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:00:06 +0000 (02:00 +0000)]

am 71acfa6c: am 49d47a02: am 76dccb7f: Fix theme/style resolution in Layoutlib [DO NOT MERGE]

* commit '71acfa6c1933806a080fc6efb820833f8de68d54':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 02:00:03 +0000 (02:00 +0000)]

am b90db3e6: am de3b2c06: am 1ed75bde: Remove references to non-std Java classes. [DO NOT MERGE]

* commit 'b90db3e6ab1bc89752ce8d7bd286268c41843693':
Remove references to non-std Java classes. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:59:58 +0000 (01:59 +0000)]

am c2a6f3b1: am 2f94c1db: am 6136af32: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]

* commit 'c2a6f3b1eda89365eec2508aec4a3a5024c140e5':
Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:59:55 +0000 (01:59 +0000)]

am 9b89fcc0: am ef9596a1: am 2bd65db1: Layoutlib tests now check methods return value [DO NOT MERGE]

* commit '9b89fcc09d0e5da7b81f1910d6ed29b152f730f9':
Layoutlib tests now check methods return value [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:57:34 +0000 (18:57 -0700)]

resolved conflicts for merge 5a7b3b65 to jb-dev-plus-aosp

Change-Id: I6bafdb9c6a8dfc6f55a4d9adf67f447661137eb8

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:57:25 +0000 (01:57 +0000)]

am 06c4f23d: am 64dc0380: Fix layoutlib [DO NOT MERGE]

* commit '06c4f23d737082717f37f5f3583d9c12f4b64bf2':
Fix layoutlib [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:57:22 +0000 (01:57 +0000)]

am cdb87d8d: am a59c27dd: Fix ClassCastException when rendering ListView [DO NOT MERGE]

* commit 'cdb87d8d83e8a76a4cf78d24d5c49ee8548eba1f':
Fix ClassCastException when rendering ListView [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:57:18 +0000 (01:57 +0000)]

am edae4e69: am 8a39c3af: Add orientation to configuration for layoutlib. [DO NOT MERGE]

* commit 'edae4e69512a7c9df1076fde70de83e15053a30a':
Add orientation to configuration for layoutlib. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:55:09 +0000 (01:55 +0000)]

am efa5ffc8: am 90ce58ec: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

* commit 'efa5ffc883bb4078494110b17f8dee4b940720c4':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:55:07 +0000 (01:55 +0000)]

am b7bafba7: am 099f40a9: Support actionProviderClass attribute for menus [DO NOT MERGE]

* commit 'b7bafba7c602150da9c0f06335e3c853e919501c':
Support actionProviderClass attribute for menus [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:55:04 +0000 (01:55 +0000)]

am 51dd8878: am 60b52ee9: Fix class name for OverflowMenuButton [DO NOT MERGE]

* commit '51dd8878cb401128d730aecf9fe18c1e06221ac4':
Fix class name for OverflowMenuButton [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:55:02 +0000 (01:55 +0000)]

am 503aaa48: am 7c6f6481: Add special system view cookie to OverflowButton. [DO NOT MERGE]

* commit '503aaa48e47538b69dc477372bc8c4ad2e955227':
Add special system view cookie to OverflowButton. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:54:59 +0000 (01:54 +0000)]

am 30db282f: am 22de7c4c: Fix style warnings in RenderSessionImpl [DO NOT MERGE]

* commit '30db282f2a3692f8c98cb3bdbb0534ad348d1bd7':
Fix style warnings in RenderSessionImpl [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:54:56 +0000 (01:54 +0000)]

am b67b1b45: am 094fd8ec: Add view cookies for action bar menus. [DO NOT MERGE]

* commit 'b67b1b450c1f35bd60882b7beec1dbfb47cd84f1':
Add view cookies for action bar menus. [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:54:53 +0000 (01:54 +0000)]

am 2c8fea2a: am 56759be8: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]

* commit '2c8fea2ad425c4ba371bcb678949613dc8db72d0':
Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]

commit | commitdiff | tree

Deepanshu Gupta [Tue, 13 May 2014 01:54:50 +0000 (01:54 +0000)]

am 0bb06b91: am fe38489f: Action bar rendering in layoutlib [DO NOT MERGE]

* commit '0bb06b91e7be5b7f8c397295094aeaf1df8dbb09':
Action bar rendering in layoutlib [DO NOT MERGE]