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

127507 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
1038247ad4 am 8b38cd7f: (-s ours) am 2deb31ff: am f1973ae2: am a1cca5cb: am 29b4986e: (-s ours) am 5c77c126: am b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit '8b38cd7ff63bcd38266b4fdb26ca993e3090b5dd':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-04-04 03:19:51 +00:00
Deepanshu Gupta
ee88c5910a am f3603fe9: (-s ours) am 6acadebe: am 74ad989d: am 77596103: am ce393373: (-s ours) am ef9f3043: am 3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev 
* commit 'f3603fe93a6a3b2002384415fbd555dd3cd2e538':
  Fix layoutlib [DO NOT MERGE]
 2014-04-04 03:19:48 +00:00
Deepanshu Gupta
4ed280d351 am c6ef5428: (-s ours) am a5346647: am 14dee803: am c7fdfe6b: am 99939cce: (-s ours) am 6094daa2: am ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'c6ef5428cf3ced10645f5bab7bc3b99ba5ec191a':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-04-04 03:19:45 +00:00
Deepanshu Gupta
e0628134ab am 53ccdf18: am ef5caff8: am c0086ba5: am 9bcfee1d: (-s ours) am 30e59135: am c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev 
* commit '53ccdf1894f64ea53e2dd57477c783c82b81e537':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-04-04 02:26:40 +00:00
Deepanshu Gupta
37f28f22e2 am 5f9887e6: am e18ae130: am 0bb7ec7e: am d8b890da: (-s ours) am af60289e: am 70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit '5f9887e6f1587dd9e761574727ca420f7d033cc4':
  Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
 2014-04-04 02:26:38 +00:00
Deepanshu Gupta
adcd4ee2e4 am 3e4aebdb: am eca9620e: am 0c44762f: am 8152502e: (-s ours) am 07d5f94e: am 2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev 
* commit '3e4aebdbfcb4290e2c0afe7d0473516c52c96e85':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
 2014-04-04 02:26:35 +00:00
Deepanshu Gupta
8b38cd7ff6 am 2deb31ff: am f1973ae2: am a1cca5cb: am 29b4986e: (-s ours) am 5c77c126: am b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit '2deb31ffbe4ce6fc3552f35847b2e02a0d938f1e':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-04-04 02:26:33 +00:00
Deepanshu Gupta
f3603fe93a am 6acadebe: am 74ad989d: am 77596103: am ce393373: (-s ours) am ef9f3043: am 3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev 
* commit '6acadebe8b7a3e498900c9eeceef7e0395768690':
  Fix layoutlib [DO NOT MERGE]
 2014-04-04 02:26:30 +00:00
Deepanshu Gupta
c6ef5428cf am a5346647: am 14dee803: am c7fdfe6b: am 99939cce: (-s ours) am 6094daa2: am ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'a53466479c0bfc29c9c05d245ae1870ff3baf09b':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-04-04 02:26:27 +00:00
Deepanshu Gupta
53ccdf1894 am ef5caff8: am c0086ba5: am 9bcfee1d: (-s ours) am 30e59135: am c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'ef5caff8b53f3b8ce85277824f14936047bc11d5':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-04-04 02:21:45 +00:00
Deepanshu Gupta
5f9887e6f1 am e18ae130: am 0bb7ec7e: am d8b890da: (-s ours) am af60289e: am 70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'e18ae1303c070759bce117b969186f699baa8564':
  Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
 2014-04-04 02:21:42 +00:00
Deepanshu Gupta
3e4aebdbfc am eca9620e: am 0c44762f: am 8152502e: (-s ours) am 07d5f94e: am 2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'eca9620e331d72afa933252dc7adb1ae3ed4d692':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
 2014-04-04 02:21:39 +00:00
Deepanshu Gupta
2deb31ffbe am f1973ae2: am a1cca5cb: am 29b4986e: (-s ours) am 5c77c126: am b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'f1973ae2107b2202cc7a2436ef1cf941cbfd9ff6':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-04-04 02:21:35 +00:00
Deepanshu Gupta
6acadebe8b am 74ad989d: am 77596103: am ce393373: (-s ours) am ef9f3043: am 3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev 
* commit '74ad989de6e5d62791edf15ebdbe45194cba3530':
  Fix layoutlib [DO NOT MERGE]
 2014-04-04 02:21:32 +00:00
Deepanshu Gupta
a53466479c am 14dee803: am c7fdfe6b: am 99939cce: (-s ours) am 6094daa2: am ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev 
* commit '14dee803f8a3b532e86613bb18d5cb572d113df9':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-04-04 02:21:29 +00:00
Deepanshu Gupta
ef5caff8b5 am c0086ba5: am 9bcfee1d: (-s ours) am 30e59135: am c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'c0086ba57f3bba1f9139baf72ed38f79f3e4ac02':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-04-04 02:14:12 +00:00
Deepanshu Gupta
e18ae1303c am 0bb7ec7e: am d8b890da: (-s ours) am af60289e: am 70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit '0bb7ec7ef9523a8e87878251ae0a0502b66e3706':
  Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
 2014-04-04 02:14:10 +00:00
Deepanshu Gupta
eca9620e33 am 0c44762f: am 8152502e: (-s ours) am 07d5f94e: am 2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev 
* commit '0c44762ffee58dbcd526ad173934e3ff48fb9ff9':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
 2014-04-04 02:14:07 +00:00
Deepanshu Gupta
f1973ae210 am a1cca5cb: am 29b4986e: (-s ours) am 5c77c126: am b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'a1cca5cb0b7ad982983aebac980c4a44827e7eb3':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-04-04 02:14:04 +00:00
Deepanshu Gupta
74ad989de6 am 77596103: am ce393373: (-s ours) am ef9f3043: am 3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev 
* commit '77596103b82939887901b04c9a46fab746ad63a7':
  Fix layoutlib [DO NOT MERGE]
 2014-04-04 02:14:01 +00:00
Deepanshu Gupta
14dee803f8 am c7fdfe6b: am 99939cce: (-s ours) am 6094daa2: am ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'c7fdfe6b67d81a62d79912780b585673043148ab':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-04-04 02:13:59 +00:00
Deepanshu Gupta
c0086ba57f am 9bcfee1d: (-s ours) am 30e59135: am c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev 
* commit '9bcfee1d3ebe9704937e6935ffe7eabd46ebbf08':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-04-04 02:07:45 +00:00
Deepanshu Gupta
0bb7ec7ef9 am d8b890da: (-s ours) am af60289e: am 70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'd8b890da785e386f08e0a3cf6b7094a23af3c8f2':
  Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
 2014-04-04 02:07:42 +00:00
Deepanshu Gupta
0c44762ffe am 8152502e: (-s ours) am 07d5f94e: am 2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev 
* commit '8152502e93edfe2f50d678d6860d3c7d1a8b4865':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
 2014-04-04 02:07:39 +00:00
Deepanshu Gupta
a1cca5cb0b am 29b4986e: (-s ours) am 5c77c126: am b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit '29b4986ecce1592bd2fe62024bb187dded33c0af':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-04-04 02:07:36 +00:00
Deepanshu Gupta
77596103b8 am ce393373: (-s ours) am ef9f3043: am 3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev 
* commit 'ce393373b73e1a1f30ce9bb41568d415cab7df49':
  Fix layoutlib [DO NOT MERGE]
 2014-04-04 02:07:32 +00:00
Deepanshu Gupta
c7fdfe6b67 am 99939cce: (-s ours) am 6094daa2: am ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev 
* commit '99939cce702b6b5a01be351f1a0b406a16509103':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-04-04 02:07:28 +00:00
Deepanshu Gupta
9bcfee1d3e am 30e59135: am c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev 
* commit '30e59135b11d196cac2edd97d1ccca3471f3e398':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-04-04 02:01:58 +00:00
Deepanshu Gupta
d8b890da78 am af60289e: am 70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'af60289e692b6b598d550371cc6e41e0b40dd6cd':
  Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
 2014-04-04 02:01:55 +00:00
Deepanshu Gupta
8152502e93 am 07d5f94e: am 2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev 
* commit '07d5f94e6b8a6d3f9caca057830e5cbd4cfa7dac':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
 2014-04-04 02:01:51 +00:00
Deepanshu Gupta
29b4986ecc am 5c77c126: am b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit '5c77c126b258924961a4a9c784177b4bcd403dd0':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-04-04 02:01:48 +00:00
Deepanshu Gupta
ce393373b7 am ef9f3043: am 3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev 
* commit 'ef9f3043f5259fa55376a1522152779295e15da6':
  Fix layoutlib [DO NOT MERGE]
 2014-04-04 02:01:45 +00:00
Deepanshu Gupta
99939cce70 am 6094daa2: am ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev 
* commit '6094daa2626e57c6bd24409f0934090581541e49':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-04-04 02:01:42 +00:00
Craig Mautner
ee8a81c4c4 am 4c4b1d65: Merge "Fix build due to bad javadoc link." 
* commit '4c4b1d65ff65ec2a6b45047ff24284989dbeb8b7':
  Fix build due to bad javadoc link.
 2014-04-04 02:00:34 +00:00
Craig Mautner
4c4b1d65ff Merge "Fix build due to bad javadoc link." 2014-04-04 01:57:47 +00:00
Jeff Tinker
c22e5339b6 am 8d0c89ad: Merge "resolved conflicts for merge of 4f342e87 to master" 
* commit '8d0c89ad16193e98c7a96f13d8f03a05e75a0f4a':
  resolved conflicts for merge of 4f342e87 to master
 2014-04-04 01:55:50 +00:00
Christopher Tate
2d79bb2300 am ed3db02c: Significant preconditions are significant 
* commit 'ed3db02c051f52f9ad3770e3c6b5b90c71a04fb1':
  Significant preconditions are significant
 2014-04-04 01:55:44 +00:00
Craig Mautner
529a43f719 Fix build due to bad javadoc link. 
Change-Id: I83ca32611fb72b79be271dc3a5bd848934e9174f
 2014-04-03 18:54:52 -07:00
Deepanshu Gupta
30e59135b1 am c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'c07a48bed2c772dc548423396b208331b22a679a':
  Fix a bug in Nine Patch library. [DO NOT MERGE]
 2014-04-04 01:54:13 +00:00
Deepanshu Gupta
af60289e69 am 70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit '70dfe865013f0c8fedf2c9468360a41b02fcce0a':
  Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
 2014-04-04 01:54:10 +00:00
Deepanshu Gupta
07d5f94e6b am 2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev 
* commit '2eb5f9e5b25dc769e5ba205237097c67fa212fd6':
  Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
 2014-04-04 01:54:08 +00:00
Deepanshu Gupta
5c77c126b2 am b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'b6588c522451f5015c2cbc902d5a72566f979f2b':
  Fix NPE in layoutlib. [DO NOT MERGE]
 2014-04-04 01:54:05 +00:00
Deepanshu Gupta
ef9f3043f5 am 3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev 
* commit '3bc5b23f8dbb6ecc4eeac4334f94682056d0cb3b':
  Fix layoutlib [DO NOT MERGE]
 2014-04-04 01:54:03 +00:00
Deepanshu Gupta
6094daa262 am ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'ba0ce05688ff7ebf91e16f5cb741701feb706fc2':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
 2014-04-04 01:54:00 +00:00
Ricardo Cervera
07aac5e346 docs: Moved small section in Build your project with Gradle doc. Bug: 13767801 
Change-Id: Ibf718f6051aabaf1120d4245ffc870fa928138be
 2014-04-03 18:04:41 -07:00
Deepanshu Gupta
c07a48bed2 Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev 2014-04-04 00:45:45 +00:00
Deepanshu Gupta
70dfe86501 Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev 2014-04-04 00:45:29 +00:00
Deepanshu Gupta
2eb5f9e5b2 Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev 2014-04-04 00:45:13 +00:00
Deepanshu Gupta
b6588c5224 Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev 2014-04-04 00:44:02 +00:00
Deepanshu Gupta
3bc5b23f8d Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev 2014-04-04 00:43:48 +00:00