121569 Commits

Author SHA1 Message Date
Deepanshu Gupta
0b878070ed 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]
* commit '61b1fd5cd9238db5f5970c30cc46dc5087b229cb':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
2014-05-13 19:02:20 +00:00
Deepanshu Gupta
3d9c18f270 am 9bdf54d3: am 41b3ef3a: am 29171d5a: am eb036026: am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev
* commit '9bdf54d3d7421c052013eb2200afbd18e3c9b48a':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
2014-05-13 19:02:17 +00:00
Deepanshu Gupta
61b1fd5cd9 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]
* commit 'e14b24f3a0c39c2e3755b55cca2600e12620ee32':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
2014-05-13 18:57:04 +00:00
Deepanshu Gupta
9bdf54d3d7 am 41b3ef3a: am 29171d5a: am eb036026: am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev
* commit '41b3ef3ae266ea766ef38947e2d5f01c55006735':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
2014-05-13 18:57:01 +00:00
Deepanshu Gupta
f316c286cb 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]
* commit '9a5d655696c65dbe05b1309713330b73e8cadb1c':
  Layoutlib tests now check methods return value [DO NOT MERGE]
2014-05-13 18:53:04 +00:00
Deepanshu Gupta
73dda53fff 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]
* commit '9141c2880cbeeb93c4e99e2b699a47796da4407f':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
2014-05-13 18:53:01 +00:00
Deepanshu Gupta
0dff67ba2b 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]
* commit '1d7c7eaf844216d25113e07c2d15c0a563fdefdf':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
2014-05-13 18:52:58 +00:00
Deepanshu Gupta
8446919f61 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]
* commit 'ef77c00d6a7010c3e511e88cf1bb8387394fbdbd':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
2014-05-13 18:52:55 +00:00
Deepanshu Gupta
81f4b8e19e 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
* commit 'b806bde9fa0225ed38fc0f999cfaaa53b436f5e0':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
2014-05-13 18:52:52 +00:00
Deepanshu Gupta
e14b24f3a0 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]
* commit '06ca4c6a4657c20ecb32bcfacabdc95c7063c99a':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
2014-05-13 18:51:50 +00:00
Deepanshu Gupta
41b3ef3ae2 am 29171d5a: am eb036026: am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev
* commit '29171d5a9ae0f406128cf6c8cdf6ceeed0a0be49':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
2014-05-13 18:51:47 +00:00
Deepanshu Gupta
dc11e8820b 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]
* commit '561fc1b69de0e9f82c1ab2dcbf5ec031476cd27c':
  Add methods for Time_Delegate [DO NOT MERGE]
2014-05-13 18:47:46 +00:00
Deepanshu Gupta
c7832db554 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]
* commit '1f21b31ed51e58c996d428434885e7ca3e1e9367':
  Fix NPE in layoutlib. [DO NOT MERGE]
2014-05-13 18:47:42 +00:00
Deepanshu Gupta
3dbb1123f1 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]
* commit 'a42d321c6ac7eef80d24e3b178306418926ce659':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
2014-05-13 18:47:39 +00:00
Deepanshu Gupta
443019c36a 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
* commit 'df7b20bd0c5b64d945f999fc9eb48b8cd4262127':
  Remove references to non-std Java classes. [DO NOT MERGE]
2014-05-13 18:47:35 +00:00
Deepanshu Gupta
06ca4c6a46 am 1281853a: am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit '1281853a17d24756223c8043b53225ffe8c8f03d':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
2014-05-13 18:47:30 +00:00
Deepanshu Gupta
29171d5a9a am eb036026: am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev
* commit 'eb0360267a122680c5ccfb3312555811aeed5a38':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
2014-05-13 18:47:27 +00:00
Deepanshu Gupta
9a5d655696 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]
* commit 'c174bdcdf125822d42f6c7ec58be0ff400dccb59':
  Layoutlib tests now check methods return value [DO NOT MERGE]
2014-05-13 18:46:53 +00:00
Deepanshu Gupta
9141c2880c 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]
* commit '90c30544963684426850feacfaa3e9348fd57896':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
2014-05-13 18:46:50 +00:00
Deepanshu Gupta
1d7c7eaf84 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]
* commit '2ffe14b8488d9ad29cad27c620d7c1f4a8954516':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
2014-05-13 18:46:48 +00:00
Deepanshu Gupta
ef77c00d6a 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]
* commit '9c30d2e8c8e57f8907f15ca9ca15e53eaed8c284':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
2014-05-13 18:46:45 +00:00
Deepanshu Gupta
b806bde9fa 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
* commit '7475771a5bad01cadbdaa7ba0a0833c2262f2933':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
2014-05-13 18:46:42 +00:00
Deepanshu Gupta
c0e9c66d7d resolved conflicts for merge of 8e015b7b to jb-mr1.1-dev 2014-05-13 11:43:45 -07:00
Deepanshu Gupta
1281853a17 am 2de8509e: am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit '2de8509e30555594e9f39c410f458d5ffc8e7917':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
2014-05-13 18:42:00 +00:00
Deepanshu Gupta
eb0360267a am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev
* commit '14788ef3e70faed432b7bf643771d126d50a59c7':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
2014-05-13 18:41:57 +00:00
Deepanshu Gupta
561fc1b69d 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]
2014-05-13 18:41:44 +00:00
Deepanshu Gupta
1f21b31ed5 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]
2014-05-13 18:41:42 +00:00
Deepanshu Gupta
c174bdcdf1 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]
* commit '76cc9bcc26d348a1df29564f57b2f18035375598':
  Layoutlib tests now check methods return value [DO NOT MERGE]
2014-05-13 18:41:41 +00:00
Deepanshu Gupta
a42d321c6a 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]
2014-05-13 18:41:39 +00:00
Deepanshu Gupta
90c3054496 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]
* commit 'd23b318c369fb986a5ffe5cd62d7af8af7ab91cf':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
2014-05-13 18:41:38 +00:00
Deepanshu Gupta
df7b20bd0c 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]
2014-05-13 18:41:36 +00:00
Deepanshu Gupta
2ffe14b848 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]
* commit '7bbd03588ce1b7d30916439929e1a32b8ccfb903':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
2014-05-13 18:41:35 +00:00
Deepanshu Gupta
9c30d2e8c8 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]
* commit 'ceb9b606f913bd98c8ced6952294656168bec239':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
2014-05-13 18:41:33 +00:00
Deepanshu Gupta
7475771a5b 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
* commit '7be53b2447d973b09a0a13daa8533084be2350f8':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
2014-05-13 18:41:30 +00:00
Deepanshu Gupta
99b33914d7 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]
2014-05-13 18:36:32 +00:00
Deepanshu Gupta
76cc9bcc26 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]
* commit '6d091cdb163a4e458568f44b2f98c9354f408e4c':
  Layoutlib tests now check methods return value [DO NOT MERGE]
2014-05-13 18:36:31 +00:00
Deepanshu Gupta
0c2aeb4a2e 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]
2014-05-13 18:36:29 +00:00
Deepanshu Gupta
d23b318c36 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]
* commit '5806ec714ec9c001f2d58bc99e89376097f6f5f7':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
2014-05-13 18:36:29 +00:00
Deepanshu Gupta
56d3c9d13f 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]
2014-05-13 18:36:26 +00:00
Deepanshu Gupta
7bbd03588c 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]
* commit 'b110aa8c3ec0069f71fc3d49f23ffd650ba6b50c':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
2014-05-13 18:36:26 +00:00
Deepanshu Gupta
ceb9b606f9 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]
* commit '4024fe96267d3906e98c314612ed24f670b71c45':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
2014-05-13 18:36:24 +00:00
Deepanshu Gupta
0ac96e7045 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]
2014-05-13 18:36:23 +00:00
Deepanshu Gupta
7be53b2447 am a73bc03b: am 471061ce: am e74d437a: am c5c49dcd: am 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev
* commit 'a73bc03b2932b6be80976fa012b9bb26783a6fce':
  Optimize layout rendering in layoutlib [DO NOT MERGE]
2014-05-13 18:36:21 +00:00
Deepanshu Gupta
2de8509e30 am 7d5299c2: am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit '7d5299c28618b10c00c7e452d34d9b2485e478fe':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
2014-05-13 18:36:14 +00:00
Deepanshu Gupta
14788ef3e7 am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev
* commit 'f8c568586d1affdfe61ec9f510e7b259d585e56b':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
2014-05-13 18:36:12 +00:00
Deepanshu Gupta
7d5299c286 am 0f26b510: am 9053261a: am 052e0c58: am 770e40f8: Fix theme/style resolution in Layoutlib [DO NOT MERGE]
* commit '0f26b5102574f0a989023485f4d63a9ac50107d2':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
2014-05-13 18:30:46 +00:00
Deepanshu Gupta
6d091cdb16 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]
* commit '2d84de2fe7e38a626571c0464a70eacc52c4ac55':
  Layoutlib tests now check methods return value [DO NOT MERGE]
2014-05-13 18:26:16 +00:00
Deepanshu Gupta
5806ec714e 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]
* commit 'f29a05164708a3f37bad94c79bea81aa4c840afc':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
2014-05-13 18:26:13 +00:00
Deepanshu Gupta
b110aa8c3e 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]
* commit '417641521487ad408c6cb32a2913ba3806fb49f7':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
2014-05-13 18:26:11 +00:00
Deepanshu Gupta
4024fe9626 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]
* commit '28c76e3e84c64bc68bb110a3924db826a78ae6e4':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
2014-05-13 18:26:08 +00:00