Gitiles
Code Review
Sign In
gerrit-public.fairphone.software
/
platform
/
frameworks
/
base
/
7dfe1fdac6f0306e1e31417d58a1a36d4280d2cc
« Previous
54b946f
am f46900c5: am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev
by Deepanshu Gupta
· 11 years ago
52b4966
am eff94bc3: am 8c19c6a1: am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev
by Deepanshu Gupta
· 11 years ago
ec1b4df
resolved conflicts for merge of b161d6ba to jb-mr1.1-dev
by Deepanshu Gupta
· 11 years ago
9358cf0
am ccf6b347: am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
f46900c
am 87a54055: am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev
by Deepanshu Gupta
· 11 years ago
6dad59e
am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev
by Deepanshu Gupta
· 11 years ago
eff94bc
am 8c19c6a1: am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev
by Deepanshu Gupta
· 11 years ago
ccf6b34
am a1546876: am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
87a5405
am 5878115a: resolved conflicts for merge of 9978c036 to jb-mr1.1-dev
by Deepanshu Gupta
· 11 years ago
85b7519
resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev
by Deepanshu Gupta
· 11 years ago
5ff35f8
Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev
by Aaron Whyte
· 11 years ago
a154687
am 7ef27645: am f192096a: am 17585160: am 26c37321: Add missing layout params to xlarge action bar. [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
8c19c6a
am 16f3a616: am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev
by Deepanshu Gupta
· 11 years ago
5878115
resolved conflicts for merge of 9978c036 to jb-mr1.1-dev
by Deepanshu Gupta
· 11 years ago
16f3a61
am c0e9c66d: resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev
by Deepanshu Gupta
· 11 years ago
e955008
am 874040d1: am 84f5acea: am 0b878070: (-s ours) am 61b1fd5c: am e14b24f3: am 06ca4c6a: (-s ours) am 1281853a: am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
c4ce076
am b59cac72: am 382a0c70: am 3d9c18f2: am 9bdf54d3: am 41b3ef3a: am 29171d5a: am eb036026: am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev
by Deepanshu Gupta
· 11 years ago
874040d
am 84f5acea: am 0b878070: (-s ours) am 61b1fd5c: am e14b24f3: am 06ca4c6a: (-s ours) am 1281853a: am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
b59cac7
am 382a0c70: am 3d9c18f2: am 9bdf54d3: am 41b3ef3a: am 29171d5a: am eb036026: am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev
by Deepanshu Gupta
· 11 years ago
84f5ace
am 0b878070: (-s ours) am 61b1fd5c: am e14b24f3: am 06ca4c6a: (-s ours) am 1281853a: am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
382a0c7
am 3d9c18f2: am 9bdf54d3: am 41b3ef3a: am 29171d5a: am eb036026: am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev
by Deepanshu Gupta
· 11 years ago
0b87807
am 61b1fd5c: am e14b24f3: am 06ca4c6a: (-s ours) am 1281853a: am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
3d9c18f
am 9bdf54d3: am 41b3ef3a: am 29171d5a: am eb036026: am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev
by Deepanshu Gupta
· 11 years ago
61b1fd5
am e14b24f3: am 06ca4c6a: (-s ours) am 1281853a: am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
9bdf54d
am 41b3ef3a: am 29171d5a: am eb036026: am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev
by Deepanshu Gupta
· 11 years ago
f316c28
am 9a5d6556: am c174bdcd: am 76cc9bcc: (-s ours) am 6d091cdb: am 2d84de2f: am 0d76fd64: (-s ours) am 3e7f0a20: am 776c1923: am 3c9fceae: am 627cab12: am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
73dda53
am 9141c288: am 90c30544: am d23b318c: (-s ours) am 5806ec71: am f29a0516: am 0c11327b: (-s ours) am d4d66df6: am 26dd61c5: am 07009057: am effef172: am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
0dff67b
am 1d7c7eaf: am 2ffe14b8: am 7bbd0358: (-s ours) am b110aa8c: am 41764152: am 8a505e5c: (-s ours) am 74d2a533: am bb7cfa1e: am 85c5cdcd: am c3a0c9f6: am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
8446919
am ef77c00d: am 9c30d2e8: am ceb9b606: (-s ours) am 4024fe96: am 28c76e3e: am 5db08e87: (-s ours) am ce68e782: am e535ff28: am 488f6247: am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
81f4b8e
am b806bde9: am 7475771a: am 7be53b24: am a73bc03b: am 471061ce: am e74d437a: am c5c49dcd: am 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev
by Deepanshu Gupta
· 11 years ago
e14b24f
am 06ca4c6a: (-s ours) am 1281853a: am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
41b3ef3
am 29171d5a: am eb036026: am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev
by Deepanshu Gupta
· 11 years ago
dc11e88
am 561fc1b6: 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]
by Deepanshu Gupta
· 11 years ago
c7832db
am 1f21b31e: 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]
by Deepanshu Gupta
· 11 years ago
3dbb112
am a42d321c: 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]
by Deepanshu Gupta
· 11 years ago
443019c
am df7b20bd: 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
by Deepanshu Gupta
· 11 years ago
06ca4c6
am 1281853a: am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
29171d5
am eb036026: am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev
by Deepanshu Gupta
· 11 years ago
9a5d655
am c174bdcd: am 76cc9bcc: (-s ours) am 6d091cdb: am 2d84de2f: am 0d76fd64: (-s ours) am 3e7f0a20: am 776c1923: am 3c9fceae: am 627cab12: am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
9141c28
am 90c30544: am d23b318c: (-s ours) am 5806ec71: am f29a0516: am 0c11327b: (-s ours) am d4d66df6: am 26dd61c5: am 07009057: am effef172: am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
1d7c7ea
am 2ffe14b8: am 7bbd0358: (-s ours) am b110aa8c: am 41764152: am 8a505e5c: (-s ours) am 74d2a533: am bb7cfa1e: am 85c5cdcd: am c3a0c9f6: am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
ef77c00
am 9c30d2e8: am ceb9b606: (-s ours) am 4024fe96: am 28c76e3e: am 5db08e87: (-s ours) am ce68e782: am e535ff28: am 488f6247: am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
b806bde
am 7475771a: am 7be53b24: am a73bc03b: am 471061ce: am e74d437a: am c5c49dcd: am 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev
by Deepanshu Gupta
· 11 years ago
c0e9c66
resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev
by Deepanshu Gupta
· 11 years ago
1281853
am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
eb03602
am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev
by Deepanshu Gupta
· 11 years ago
561fc1b
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]
by Deepanshu Gupta
· 11 years ago
1f21b31
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]
by Deepanshu Gupta
· 11 years ago
c174bdc
am 76cc9bcc: (-s ours) am 6d091cdb: am 2d84de2f: am 0d76fd64: (-s ours) am 3e7f0a20: am 776c1923: am 3c9fceae: am 627cab12: am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
a42d321
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]
by Deepanshu Gupta
· 11 years ago
90c3054
am d23b318c: (-s ours) am 5806ec71: am f29a0516: am 0c11327b: (-s ours) am d4d66df6: am 26dd61c5: am 07009057: am effef172: am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
df7b20b
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
by Deepanshu Gupta
· 11 years ago
2ffe14b
am 7bbd0358: (-s ours) am b110aa8c: am 41764152: am 8a505e5c: (-s ours) am 74d2a533: am bb7cfa1e: am 85c5cdcd: am c3a0c9f6: am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
9c30d2e
am ceb9b606: (-s ours) am 4024fe96: am 28c76e3e: am 5db08e87: (-s ours) am ce68e782: am e535ff28: am 488f6247: am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
7475771
am 7be53b24: am a73bc03b: am 471061ce: am e74d437a: am c5c49dcd: am 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev
by Deepanshu Gupta
· 11 years ago
99b3391
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]
by Deepanshu Gupta
· 11 years ago
76cc9bc
am 6d091cdb: am 2d84de2f: am 0d76fd64: (-s ours) am 3e7f0a20: am 776c1923: am 3c9fceae: am 627cab12: am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
0c2aeb4
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]
by Deepanshu Gupta
· 11 years ago
d23b318
am 5806ec71: am f29a0516: am 0c11327b: (-s ours) am d4d66df6: am 26dd61c5: am 07009057: am effef172: am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
56d3c9d
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]
by Deepanshu Gupta
· 11 years ago
7bbd035
am b110aa8c: am 41764152: am 8a505e5c: (-s ours) am 74d2a533: am bb7cfa1e: am 85c5cdcd: am c3a0c9f6: am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
ceb9b60
am 4024fe96: am 28c76e3e: am 5db08e87: (-s ours) am ce68e782: am e535ff28: am 488f6247: am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
0ac96e7
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
by Deepanshu Gupta
· 11 years ago
7be53b2
am a73bc03b: am 471061ce: am e74d437a: am c5c49dcd: am 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev
by Deepanshu Gupta
· 11 years ago
2de8509
am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
14788ef
am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev
by Deepanshu Gupta
· 11 years ago
7d5299c
am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
6d091cd
am 2d84de2f: am 0d76fd64: (-s ours) am 3e7f0a20: am 776c1923: am 3c9fceae: am 627cab12: am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
5806ec7
am f29a0516: am 0c11327b: (-s ours) am d4d66df6: am 26dd61c5: am 07009057: am effef172: am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
b110aa8
am 41764152: am 8a505e5c: (-s ours) am 74d2a533: am bb7cfa1e: am 85c5cdcd: am c3a0c9f6: am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
4024fe9
am 28c76e3e: am 5db08e87: (-s ours) am ce68e782: am e535ff28: am 488f6247: am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
a73bc03
am 471061ce: am e74d437a: am c5c49dcd: am 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev
by Deepanshu Gupta
· 11 years ago
3f615bf
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]
by Deepanshu Gupta
· 11 years ago
8816bdf
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]
by Deepanshu Gupta
· 11 years ago
851aece
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]
by Deepanshu Gupta
· 11 years ago
1ba65c7
am af6dcd4f: am 48e3d0fa: am dbfd29d8: am 81ff5ba7: am 72e3fc1d: am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev
by Deepanshu Gupta
· 11 years ago
f265043
am 403cc2f9: 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
by Deepanshu Gupta
· 11 years ago
2d84de2
am 0d76fd64: (-s ours) am 3e7f0a20: am 776c1923: am 3c9fceae: am 627cab12: am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
f29a051
am 0c11327b: (-s ours) am d4d66df6: am 26dd61c5: am 07009057: am effef172: am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
4176415
am 8a505e5c: (-s ours) am 74d2a533: am bb7cfa1e: am 85c5cdcd: am c3a0c9f6: am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
28c76e3
am 5db08e87: (-s ours) am ce68e782: am e535ff28: am 488f6247: am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
471061c
am e74d437a: am c5c49dcd: am 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev
by Deepanshu Gupta
· 11 years ago
403cc2f
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
by Deepanshu Gupta
· 11 years ago
e0d3e66
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]
by Deepanshu Gupta
· 11 years ago
39daf02
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]
by Deepanshu Gupta
· 11 years ago
a63a1f9
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]
by Deepanshu Gupta
· 11 years ago
af6dcd4
am 48e3d0fa: am dbfd29d8: am 81ff5ba7: am 72e3fc1d: am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev
by Deepanshu Gupta
· 11 years ago
b1cf6a8
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
by Deepanshu Gupta
· 11 years ago
0d76fd6
am 3e7f0a20: am 776c1923: am 3c9fceae: am 627cab12: am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
0c11327
am d4d66df6: am 26dd61c5: am 07009057: am effef172: am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
8a505e5
am 74d2a533: am bb7cfa1e: am 85c5cdcd: am c3a0c9f6: am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
5db08e8
am ce68e782: am e535ff28: am 488f6247: am 835cbaa1: am 9f965258: am d094742d: am cda89ca0: Fix a bug in Nine Patch library. [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
e74d437
am c5c49dcd: am 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev
by Deepanshu Gupta
· 11 years ago
2f8da10
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]
by Deepanshu Gupta
· 11 years ago
1eadb79
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]
by Deepanshu Gupta
· 11 years ago
910c715
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]
by Deepanshu Gupta
· 11 years ago
48e3d0f
am dbfd29d8: am 81ff5ba7: am 72e3fc1d: am 6f58831c: resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev
by Deepanshu Gupta
· 11 years ago
3e7f0a2
am 776c1923: am 3c9fceae: am 627cab12: am 45693e50: am c9a4badb: am d915dcac: Layoutlib tests now check methods return value [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
d4d66df
am 26dd61c5: am 07009057: am effef172: am e3b43270: am bdd8fbf6: am 877ae535: Set default text style in layoutlib as NORMAL [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
74d2a53
am bb7cfa1e: am 85c5cdcd: am c3a0c9f6: am 45ca5ba7: am 01cdd312: am 669792b3: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
by Deepanshu Gupta
· 11 years ago
Next »