OSDN Git Service
Deepanshu Gupta [Tue, 13 May 2014 18:41:44 +0000 (18:41 +0000)]
am
99b33914: am
3f615bf2: (-s ours) am
e0d3e66d: am
2f8da100: am
81ac665c: (-s ours) am
060836bd: am
fed25eb8: am
c233bb65: am
8a4f3935: am
48bf7b49: am
69b3115e: am
e183855c: Add methods for Time_Delegate [DO NOT MERGE]
* commit '
99b33914d7b6ff371397892365685c6e5f56aea9':
Add methods for Time_Delegate [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:41:42 +0000 (18:41 +0000)]
am
0c2aeb4a: am
8816bdfa: (-s ours) am
39daf02e: am
1eadb79e: 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 '
0c2aeb4a2e221b4860a5855975065bda7a33a4f4':
Fix NPE in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:41:39 +0000 (18:41 +0000)]
am
56d3c9d1: am
851aece2: (-s ours) am
a63a1f9b: am
910c7153: 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 '
56d3c9d13fd846f99dd36ab5c68b793ef092906f':
Fix text size in Fake Action Bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:41:36 +0000 (18:41 +0000)]
am
0ac96e70: am
1ba65c7a: am
af6dcd4f: am
48e3d0fa: am
dbfd29d8: am
81ff5ba7: am
72e3fc1d: am
6f58831c: resolved conflicts for merge of
5f61e9b4 to jb-mr1.1-dev
* commit '
0ac96e704597533ca702d082ac9d4857e5a80723':
Remove references to non-std Java classes. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:36:32 +0000 (18:36 +0000)]
am
3f615bf2: (-s ours) am
e0d3e66d: am
2f8da100: am
81ac665c: (-s ours) am
060836bd: am
fed25eb8: am
c233bb65: am
8a4f3935: am
48bf7b49: am
69b3115e: am
e183855c: Add methods for Time_Delegate [DO NOT MERGE]
* commit '
3f615bf2f9de920b2c29386e8978b7e5f7613d66':
Add methods for Time_Delegate [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:36:29 +0000 (18:36 +0000)]
am
8816bdfa: (-s ours) am
39daf02e: am
1eadb79e: 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 '
8816bdfa3b776c09f2e9860c75cd830bdadac7a5':
Fix NPE in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:36:26 +0000 (18:36 +0000)]
am
851aece2: (-s ours) am
a63a1f9b: am
910c7153: 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 '
851aece2c8a9e9d6a058ffa3f12d8424abaeaa95':
Fix text size in Fake Action Bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:36:23 +0000 (18:36 +0000)]
am
1ba65c7a: am
af6dcd4f: am
48e3d0fa: am
dbfd29d8: am
81ff5ba7: am
72e3fc1d: am
6f58831c: resolved conflicts for merge of
5f61e9b4 to jb-mr1.1-dev
* commit '
1ba65c7a8951d6de64d2e3582f5aa6fa4f5a0549':
Remove references to non-std Java classes. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:25:19 +0000 (18:25 +0000)]
am
e0d3e66d: am
2f8da100: am
81ac665c: (-s ours) am
060836bd: am
fed25eb8: am
c233bb65: am
8a4f3935: am
48bf7b49: am
69b3115e: am
e183855c: Add methods for Time_Delegate [DO NOT MERGE]
* commit '
e0d3e66d811ac689ebf655887298afe1e5c7b99f':
Add methods for Time_Delegate [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:25:16 +0000 (18:25 +0000)]
am
39daf02e: am
1eadb79e: 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 '
39daf02eb1a6035e0484792e1ecbd15d1d84906e':
Fix NPE in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:25:13 +0000 (18:25 +0000)]
am
a63a1f9b: am
910c7153: 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 '
a63a1f9b0eb414a2bcc74e7d70d04ac2205d3004':
Fix text size in Fake Action Bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:25:10 +0000 (18:25 +0000)]
am
af6dcd4f: am
48e3d0fa: am
dbfd29d8: am
81ff5ba7: am
72e3fc1d: am
6f58831c: resolved conflicts for merge of
5f61e9b4 to jb-mr1.1-dev
* commit '
af6dcd4f956b74e1af8f3558412bbc847d4bcd71':
Remove references to non-std Java classes. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:20:56 +0000 (18:20 +0000)]
am
b1cf6a87: am
a7ed116d: am
5dce0a4b: am
a1191b46: am
74503f66: am
0c98ce5a: am
f75f33d3: am
dd8ebf1e: resolved conflicts for merge of
520f585b to jb-mr1.1-dev
* commit '
b1cf6a87e431054632bfb5ec512f3c4680700f9e':
Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:19:12 +0000 (18:19 +0000)]
am
2f8da100: am
81ac665c: (-s ours) am
060836bd: am
fed25eb8: am
c233bb65: am
8a4f3935: am
48bf7b49: am
69b3115e: am
e183855c: Add methods for Time_Delegate [DO NOT MERGE]
* commit '
2f8da100eff9245c37042c962af39d21d27c06b1':
Add methods for Time_Delegate [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:19:09 +0000 (18:19 +0000)]
am
1eadb79e: 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 '
1eadb79e470cd86a1a32f9cdda997b054aa1efe0':
Fix NPE in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:19:07 +0000 (18:19 +0000)]
am
910c7153: 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 '
910c7153fc5f225eb98209a4fd2d03f183833651':
Fix text size in Fake Action Bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:19:05 +0000 (18:19 +0000)]
am
48e3d0fa: am
dbfd29d8: am
81ff5ba7: am
72e3fc1d: am
6f58831c: resolved conflicts for merge of
5f61e9b4 to jb-mr1.1-dev
* commit '
48e3d0fac84657f14991cbb14b23fb229a4f6362':
Remove references to non-std Java classes. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:16:50 +0000 (18:16 +0000)]
am
a7ed116d: am
5dce0a4b: am
a1191b46: am
74503f66: am
0c98ce5a: am
f75f33d3: am
dd8ebf1e: resolved conflicts for merge of
520f585b to jb-mr1.1-dev
* commit '
a7ed116d0f0b677f0986e0861d4beaf3d360a9d4':
Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:14:14 +0000 (18:14 +0000)]
am
81ac665c: (-s ours) am
060836bd: am
fed25eb8: am
c233bb65: am
8a4f3935: am
48bf7b49: am
69b3115e: am
e183855c: Add methods for Time_Delegate [DO NOT MERGE]
* commit '
81ac665ca522fcfd9135b4c6fde6e3c25791bdc3':
Add methods for Time_Delegate [DO NOT MERGE]
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]
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]
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]
Deepanshu Gupta [Tue, 13 May 2014 18:11:14 +0000 (18:11 +0000)]
am
5dce0a4b: am
a1191b46: am
74503f66: am
0c98ce5a: am
f75f33d3: am
dd8ebf1e: resolved conflicts for merge of
520f585b to jb-mr1.1-dev
* commit '
5dce0a4b3d933e5d7174ba487fd180b6165d2923':
Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:09:09 +0000 (18:09 +0000)]
am
060836bd: am
fed25eb8: am
c233bb65: am
8a4f3935: am
48bf7b49: am
69b3115e: am
e183855c: Add methods for Time_Delegate [DO NOT MERGE]
* commit '
060836bdf742cc790014cf0f2eaa80b4ace92841':
Add methods for Time_Delegate [DO NOT MERGE]
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]
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]
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]
Deepanshu Gupta [Tue, 13 May 2014 18:05:51 +0000 (18:05 +0000)]
am
a1191b46: am
74503f66: am
0c98ce5a: am
f75f33d3: am
dd8ebf1e: resolved conflicts for merge of
520f585b to jb-mr1.1-dev
* commit '
a1191b467d9687cd34e0cec2d4ac827f6020c160':
Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 18:03:44 +0000 (18:03 +0000)]
am
fed25eb8: am
c233bb65: am
8a4f3935: am
48bf7b49: am
69b3115e: am
e183855c: Add methods for Time_Delegate [DO NOT MERGE]
* commit '
fed25eb8b316d968154c204271ac0d239afd805e':
Add methods for Time_Delegate [DO NOT MERGE]
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]
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]
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]
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]
Deepanshu Gupta [Tue, 13 May 2014 17:57:58 +0000 (17:57 +0000)]
am
c233bb65: am
8a4f3935: am
48bf7b49: am
69b3115e: am
e183855c: Add methods for Time_Delegate [DO NOT MERGE]
* commit '
c233bb65bc10c20fa74fac55461a35c290cfb5f9':
Add methods for Time_Delegate [DO NOT MERGE]
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]
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]
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]
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]
Deepanshu Gupta [Tue, 13 May 2014 17:54:29 +0000 (17:54 +0000)]
am
8a4f3935: am
48bf7b49: am
69b3115e: am
e183855c: Add methods for Time_Delegate [DO NOT MERGE]
* commit '
8a4f39351f5784c81501462fc84d6fe199bdedca':
Add methods for Time_Delegate [DO NOT MERGE]
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]
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]
Deepanshu Gupta [Tue, 13 May 2014 17:51:28 +0000 (10:51 -0700)]
resolved conflicts for merge of
5f61e9b4 to jb-mr1.1-dev
Deepanshu Gupta [Tue, 13 May 2014 17:50:55 +0000 (17:50 +0000)]
am
862e64ad: am
bacf26f4: (-s ours) am
8b53c5b1: am
ebcbb283: 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 '
862e64addc2c56a27fa39611a6d559caae6cd9dd':
Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 17:50:45 +0000 (17:50 +0000)]
am
5fc8f945: am
b0f2ded5: am
40db4a13: am
9ddb073b: am
c70ce72a: am
af9fde96: am
425addb9: am
a43aaf00: resolved conflicts for merge of
9c00e673 to jb-mr1.1-dev
* commit '
5fc8f945ee6a763b08e47019319432ec71ba1d1a':
Fix CalendarView to show the right labels. [DO NOT MERGE]
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]
Deepanshu Gupta [Tue, 13 May 2014 17:45:51 +0000 (17:45 +0000)]
am
bacf26f4: (-s ours) am
8b53c5b1: am
ebcbb283: 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 '
bacf26f44141ae8f861f96e3eb09da8b9e9a657a':
Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 17:45:43 +0000 (17:45 +0000)]
am
b0f2ded5: am
40db4a13: am
9ddb073b: am
c70ce72a: am
af9fde96: am
425addb9: am
a43aaf00: resolved conflicts for merge of
9c00e673 to jb-mr1.1-dev
* commit '
b0f2ded5e9e84fb51ec5b2cb6b419b040b008276':
Fix CalendarView to show the right labels. [DO NOT MERGE]
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]
Deepanshu Gupta [Tue, 13 May 2014 17:39:17 +0000 (17:39 +0000)]
am
8b53c5b1: am
ebcbb283: 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 '
8b53c5b16b612c35b3d3512e9dc726eceebab308':
Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 17:39:14 +0000 (17:39 +0000)]
am
40db4a13: am
9ddb073b: am
c70ce72a: am
af9fde96: am
425addb9: am
a43aaf00: resolved conflicts for merge of
9c00e673 to jb-mr1.1-dev
* commit '
40db4a13bc8389dd94cac2fd4c896e10b46c2499':
Fix CalendarView to show the right labels. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 17:35:04 +0000 (17:35 +0000)]
am
ebcbb283: 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 '
ebcbb28319bea2674455c978cc8fb85b252863b3':
Layoutlib: Update the wifi icon in the status bar. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 17:35:00 +0000 (17:35 +0000)]
am
9ddb073b: am
c70ce72a: am
af9fde96: am
425addb9: am
a43aaf00: resolved conflicts for merge of
9c00e673 to jb-mr1.1-dev
* commit '
9ddb073bf72d9ca587ecc626dcc9721dd33447c9':
Fix CalendarView to show the right labels. [DO NOT MERGE]
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]
Ricardo Cervera [Tue, 13 May 2014 17:29:20 +0000 (17:29 +0000)]
am
9d7cf825: Merge "docs: Added release notes for Build Tools 19.1.0" into klp-docs
* commit '
9d7cf8256105ea2171999cbcc8a613a58a25f953':
docs: Added release notes for Build Tools 19.1.0
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]
Ricardo Cervera [Tue, 13 May 2014 17:24:49 +0000 (17:24 +0000)]
Merge "docs: Added release notes for Build Tools 19.1.0" into klp-docs
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]
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]
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
Ricardo Cervera [Wed, 7 May 2014 21:00:06 +0000 (14:00 -0700)]
docs: Added release notes for Build Tools 19.1.0
Change-Id: Icd162f7b1b7634b7b503d6d39a17fcb1c43a74c9
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]
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]
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]
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]
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]
Deepanshu Gupta [Tue, 13 May 2014 17:07:41 +0000 (17:07 +0000)]
am
3271adea: am
6b0c4276: am
dff29f73: am
5974d229: am
0cbfde12: am
40b54563: am
07f8da65: am
888461c8: resolved conflicts for merge of
1103ece2 to jb-mr1.1-dev
* commit '
3271adea10a7a35d4fe852801794038f01e371be':
Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 17:02:20 +0000 (17:02 +0000)]
am
6b0c4276: am
dff29f73: am
5974d229: am
0cbfde12: am
40b54563: am
07f8da65: am
888461c8: resolved conflicts for merge of
1103ece2 to jb-mr1.1-dev
* commit '
6b0c427670606abf5539789299042dc04c67703e':
Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:57:08 +0000 (16:57 +0000)]
am
dff29f73: am
5974d229: am
0cbfde12: am
40b54563: am
07f8da65: am
888461c8: resolved conflicts for merge of
1103ece2 to jb-mr1.1-dev
* commit '
dff29f73612799506739c8ef83e1313461f37a4b':
Fix layoutlib [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 16:51:51 +0000 (16:51 +0000)]
am
5974d229: am
0cbfde12: am
40b54563: am
07f8da65: am
888461c8: resolved conflicts for merge of
1103ece2 to jb-mr1.1-dev
* commit '
5974d229f9af39df149c8b0c4081826f9a65ce8c':
Fix layoutlib [DO NOT MERGE]
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
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]
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]
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]
Deepanshu Gupta [Tue, 13 May 2014 16:36:36 +0000 (16:36 +0000)]
am
48bf7b49: am
69b3115e: am
e183855c: Add methods for Time_Delegate [DO NOT MERGE]
* commit '
48bf7b49bb361a4084e5fb4c6d0ae497a606c700':
Add methods for Time_Delegate [DO NOT MERGE]
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]
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]
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]
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]
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]
Deepanshu Gupta [Tue, 13 May 2014 16:31:38 +0000 (16:31 +0000)]
am
69b3115e: am
e183855c: Add methods for Time_Delegate [DO NOT MERGE]
* commit '
69b3115e1c02f2b22165b93bd9bcc5c90ec69b12':
Add methods for Time_Delegate [DO NOT MERGE]
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]
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]
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]
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]
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]
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]
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]
Deepanshu Gupta [Tue, 13 May 2014 02:45:29 +0000 (02:45 +0000)]
am
663a1c74: am
9e0593fb: (-s ours) am
513bf25d: am
5b42e1ae: 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 '
663a1c7484b7df5134712149d59a9863980c4470':
Fix ClassCastException when rendering ListView [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 02:45:26 +0000 (02:45 +0000)]
am
83d33e06: am
ffb18143: (-s ours) am
0d90b43b: am
cb240066: 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 '
83d33e0603ef45c23edc06feac7ea8d8ef92b431':
Add orientation to configuration for layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 02:41:18 +0000 (02:41 +0000)]
am
9e0593fb: (-s ours) am
513bf25d: am
5b42e1ae: 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 '
9e0593fbb57339143779f760fff6314bdf9c839b':
Fix ClassCastException when rendering ListView [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 02:41:14 +0000 (02:41 +0000)]
am
ffb18143: (-s ours) am
0d90b43b: am
cb240066: 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 '
ffb181431cdfe389911cf02de76badde05e46112':
Add orientation to configuration for layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 02:37:20 +0000 (02:37 +0000)]
am
513bf25d: am
5b42e1ae: 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 '
513bf25d7a794b850f5d791269db55b7744ee618':
Fix ClassCastException when rendering ListView [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 02:37:17 +0000 (02:37 +0000)]
am
0d90b43b: am
cb240066: 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 '
0d90b43b58bca53a096d646ed555c4ecb40d40d2':
Add orientation to configuration for layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 02:31:40 +0000 (02:31 +0000)]
am
5b42e1ae: 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 '
5b42e1ae5576f95d9d561a15674e392657f64120':
Fix ClassCastException when rendering ListView [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 02:31:38 +0000 (02:31 +0000)]
am
cb240066: 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 '
cb2400661a6019cfc6f2fef75d92767f6d7547b6':
Add orientation to configuration for layoutlib. [DO NOT MERGE]
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]
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]
Deepanshu Gupta [Tue, 13 May 2014 02:25:03 +0000 (02:25 +0000)]
am
83b43dc0: am
a8499a16: (-s ours) am
e4ea6a30: am
1d5b9018: am
018da2e9: (-s ours) am
1ba310ca: am
efa5ffc8: am
90ce58ec: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
* commit '
83b43dc0c98abc416bff1e518206e9dda5244e28':
Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 02:25:00 +0000 (02:25 +0000)]
am
59889153: am
7aaa59f0: (-s ours) am
74ae54e7: am
1d46a343: am
06a87027: (-s ours) am
995c4d51: am
b7bafba7: am
099f40a9: Support actionProviderClass attribute for menus [DO NOT MERGE]
* commit '
59889153bae4f3f6a3270ef6eae69f1a937eeb4a':
Support actionProviderClass attribute for menus [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 02:24:58 +0000 (02:24 +0000)]
am
b0d4ca69: am
d5260dcc: (-s ours) am
d1f26941: am
e69715b4: am
70b2be8e: (-s ours) am
59a0f746: am
51dd8878: am
60b52ee9: Fix class name for OverflowMenuButton [DO NOT MERGE]
* commit '
b0d4ca69168cce0fec9eb4b442e3002eb07bbf3a':
Fix class name for OverflowMenuButton [DO NOT MERGE]
OSDN Git Service
