summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am c23ab90c: am 07aac5e3: docs: Moved small section in Build your project ↵Ricardo Cervera2014-04-041-14/+19
|\ | | | | | | | | | | | | with Gradle doc. Bug: 13767801 * commit 'c23ab90c80c76c0f5249190ff26dac1fa5992d3b': docs: Moved small section in Build your project with Gradle doc. Bug: 13767801
| * am 07aac5e3: docs: Moved small section in Build your project with Gradle ↵Ricardo Cervera2014-04-041-14/+19
| |\ | | | | | | | | | | | | | | | | | | doc. Bug: 13767801 * commit '07aac5e346c3fed31254e34d386c6236f1ac3f22': docs: Moved small section in Build your project with Gradle doc. Bug: 13767801
| | * docs: Moved small section in Build your project with Gradle doc. Bug: 13767801Ricardo Cervera2014-04-031-14/+19
| | | | | | | | | | | | Change-Id: Ibf718f6051aabaf1120d4245ffc870fa928138be
* | | am b2856041: (-s ours) am 81e62eb1: (-s ours) Merge "Import translations. DO ↵Baligh Uddin2014-04-040-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | NOT MERGE" into klp-dev * commit 'b285604185de1ade346eadb78971712607f54058': Import translations. DO NOT MERGE
| * | am 81e62eb1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2014-04-040-0/+0
| |\ \ | | | | | | | | | | | | | | | | * commit '81e62eb1e576388866779e6f29d71614892dcf8a': Import translations. DO NOT MERGE
| | * \ Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2014-04-041-8/+8
| | |\ \
| | | * | Import translations. DO NOT MERGEBaligh Uddin2014-04-021-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3ba9a4dc3048b098598e12a78e7cc7dde521ea56 Auto-generated-cl: translation import
* | | | | am 15fdce9d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-devBaligh Uddin2014-04-040-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '15fdce9d65b47e2b92bcac78776cc01486cff61a': Import translations. DO NOT MERGE
| * | | | Merge "Import translations. DO NOT MERGE" into klp-ub-devBaligh Uddin2014-04-0456-1691/+2541
| |\ \ \ \
| | * | | | Import translations. DO NOT MERGEBaligh Uddin2014-04-0256-1691/+2541
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iedc52a08baa64f6294add074ebf597d09c06725a Auto-generated-cl: translation import
* | | | | | am ef5caff8: am c0086ba5: am 9bcfee1d: (-s ours) am 30e59135: am c07a48be: ↵Deepanshu Gupta2014-04-040-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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]
| * | | | | am c0086ba5: am 9bcfee1d: (-s ours) am 30e59135: am c07a48be: Merge "Fix a ↵Deepanshu Gupta2014-04-040-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-dev * commit 'c0086ba57f3bba1f9139baf72ed38f79f3e4ac02': Fix a bug in Nine Patch library. [DO NOT MERGE]
| | * | | | am 9bcfee1d: (-s ours) am 30e59135: am c07a48be: Merge "Fix a bug in Nine ↵Deepanshu Gupta2014-04-040-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch library. [DO NOT MERGE]" into jb-mr2-dev * commit '9bcfee1d3ebe9704937e6935ffe7eabd46ebbf08': Fix a bug in Nine Patch library. [DO NOT MERGE]
| | | * \ \ \ am 30e59135: am c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT ↵Deepanshu Gupta2014-04-041-2/+2
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE]" into jb-mr2-dev * commit '30e59135b11d196cac2edd97d1ccca3471f3e398': Fix a bug in Nine Patch library. [DO NOT MERGE]
| | | | * \ \ \ am c07a48be: Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into ↵Deepanshu Gupta2014-04-041-2/+2
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit 'c07a48bed2c772dc548423396b208331b22a679a': Fix a bug in Nine Patch library. [DO NOT MERGE]
| | | | | * \ \ \ Merge "Fix a bug in Nine Patch library. [DO NOT MERGE]" into jb-mr2-devDeepanshu Gupta2014-04-041-2/+2
| | | | | |\ \ \ \
| | | | | | * | | | Fix a bug in Nine Patch library. [DO NOT MERGE]Deepanshu Gupta2014-03-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The nine patches were not drawn correctly if they were not positioned at the top left corner of the canvas. Bug: http://b.android.com/29959 Change-Id: Icfed522ea07322a3ee9f3955067d3da26c4b0b5b (cherry-picked from 8a892279bd1b212311f4200f306a317985463918)
* | | | | | | | | | am e18ae130: am 0bb7ec7e: am d8b890da: (-s ours) am af60289e: am 70dfe865: ↵Deepanshu Gupta2014-04-040-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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]
| * | | | | | | | | am 0bb7ec7e: am d8b890da: (-s ours) am af60289e: am 70dfe865: Merge "Add ↵Deepanshu Gupta2014-04-040-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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]
| | * | | | | | | | am d8b890da: (-s ours) am af60289e: am 70dfe865: Merge "Add missing files to ↵Deepanshu Gupta2014-04-040-0/+0
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix libphonenumber for layoutlib. [DO NOT MERGE]" into jb-mr2-dev * commit 'd8b890da785e386f08e0a3cf6b7094a23af3c8f2': Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
| | | * | | | | | | am af60289e: am 70dfe865: Merge "Add missing files to fix libphonenumber for ↵Deepanshu Gupta2014-04-049-31/+143
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | layoutlib. [DO NOT MERGE]" into jb-mr2-dev * commit 'af60289e692b6b598d550371cc6e41e0b40dd6cd': Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
| | | | * | | | | | am 70dfe865: Merge "Add missing files to fix libphonenumber for layoutlib. ↵Deepanshu Gupta2014-04-049-31/+143
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [DO NOT MERGE]" into jb-mr2-dev * commit '70dfe865013f0c8fedf2c9468360a41b02fcce0a': Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]
| | | | | * | | | | Merge "Add missing files to fix libphonenumber for layoutlib. [DO NOT ↵Deepanshu Gupta2014-04-049-31/+143
| | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE]" into jb-mr2-dev
| | | | | | * | | | | Add missing files to fix libphonenumber for layoutlib. [DO NOT MERGE]Deepanshu Gupta2014-03-279-31/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8102da6c1c4625e887293a8823770d199521c53f (cherry-picked from 58037a4404e639d28695a0f1c17053b53b96b970)
* | | | | | | | | | | am eca9620e: am 0c44762f: am 8152502e: (-s ours) am 07d5f94e: am 2eb5f9e5: ↵Deepanshu Gupta2014-04-040-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev * commit 'eca9620e331d72afa933252dc7adb1ae3ed4d692': Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
| * | | | | | | | | | am 0c44762f: am 8152502e: (-s ours) am 07d5f94e: am 2eb5f9e5: Merge "Add ↵Deepanshu Gupta2014-04-040-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev * commit '0c44762ffee58dbcd526ad173934e3ff48fb9ff9': Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
| | * | | | | | | | | am 8152502e: (-s ours) am 07d5f94e: am 2eb5f9e5: Merge "Add libphonenumber ↵Deepanshu Gupta2014-04-040-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-dev * commit '8152502e93edfe2f50d678d6860d3c7d1a8b4865': Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
| | | * | | | | | | | am 07d5f94e: am 2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO ↵Deepanshu Gupta2014-04-042-1/+7
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE]" into jb-mr2-dev * commit '07d5f94e6b8a6d3f9caca057830e5cbd4cfa7dac': Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
| | | | * | | | | | | am 2eb5f9e5: Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" ↵Deepanshu Gupta2014-04-042-1/+7
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr2-dev * commit '2eb5f9e5b25dc769e5ba205237097c67fa212fd6': Add libphonenumber to layoutlib.jar. [DO NOT MERGE]
| | | | | * | | | | | Merge "Add libphonenumber to layoutlib.jar. [DO NOT MERGE]" into jb-mr2-devDeepanshu Gupta2014-04-042-1/+7
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / /
| | | | | | * | | | | Add libphonenumber to layoutlib.jar. [DO NOT MERGE]Deepanshu Gupta2014-03-272-1/+7
| | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: http://b.android.com/59497 Change-Id: Ief11e602703b6041db66241f1699cc1de72e65a5 (cherry-picked from 1f92d7fc0ffa72d7db93244c29a1a6575bb4b318)
* | | | | | | | | | am f1973ae2: am a1cca5cb: am 29b4986e: (-s ours) am 5c77c126: am b6588c52: ↵Deepanshu Gupta2014-04-040-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev * commit 'f1973ae2107b2202cc7a2436ef1cf941cbfd9ff6': Fix NPE in layoutlib. [DO NOT MERGE]
| * | | | | | | | | am a1cca5cb: am 29b4986e: (-s ours) am 5c77c126: am b6588c52: Merge "Fix NPE ↵Deepanshu Gupta2014-04-040-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in layoutlib. [DO NOT MERGE]" into jb-mr2-dev * commit 'a1cca5cb0b7ad982983aebac980c4a44827e7eb3': Fix NPE in layoutlib. [DO NOT MERGE]
| | * | | | | | | | am 29b4986e: (-s ours) am 5c77c126: am b6588c52: Merge "Fix NPE in ↵Deepanshu Gupta2014-04-040-0/+0
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | layoutlib. [DO NOT MERGE]" into jb-mr2-dev * commit '29b4986ecce1592bd2fe62024bb187dded33c0af': Fix NPE in layoutlib. [DO NOT MERGE]
| | | * | | | | | | am 5c77c126: am b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into ↵Deepanshu Gupta2014-04-041-1/+0
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit '5c77c126b258924961a4a9c784177b4bcd403dd0': Fix NPE in layoutlib. [DO NOT MERGE]
| | | | * | | | | | am b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-devDeepanshu Gupta2014-04-041-1/+0
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b6588c522451f5015c2cbc902d5a72566f979f2b': Fix NPE in layoutlib. [DO NOT MERGE]
| | | | | * | | | | Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-devDeepanshu Gupta2014-04-041-1/+0
| | | | | |\ \ \ \ \
| | | | | | * | | | | Fix NPE in layoutlib. [DO NOT MERGE]Deepanshu Gupta2014-03-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I36623304d83b344ea078044001577b8005a63c02 (cherry-picked from d0581d271e814670d81a6550aa7b1e86864d5710)
* | | | | | | | | | | am 74ad989d: am 77596103: am ce393373: (-s ours) am ef9f3043: am 3bc5b23f: ↵Deepanshu Gupta2014-04-040-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-dev * commit '74ad989de6e5d62791edf15ebdbe45194cba3530': Fix layoutlib [DO NOT MERGE]
| * | | | | | | | | | am 77596103: am ce393373: (-s ours) am ef9f3043: am 3bc5b23f: Merge "Fix ↵Deepanshu Gupta2014-04-040-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | layoutlib [DO NOT MERGE]" into jb-mr2-dev * commit '77596103b82939887901b04c9a46fab746ad63a7': Fix layoutlib [DO NOT MERGE]
| | * | | | | | | | | am ce393373: (-s ours) am ef9f3043: am 3bc5b23f: Merge "Fix layoutlib [DO ↵Deepanshu Gupta2014-04-040-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE]" into jb-mr2-dev * commit 'ce393373b73e1a1f30ce9bb41568d415cab7df49': Fix layoutlib [DO NOT MERGE]
| | | * | | | | | | | am ef9f3043: am 3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-devDeepanshu Gupta2014-04-042-7/+19
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ef9f3043f5259fa55376a1522152779295e15da6': Fix layoutlib [DO NOT MERGE]
| | | | * | | | | | | am 3bc5b23f: Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-devDeepanshu Gupta2014-04-042-7/+19
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3bc5b23f8dbb6ecc4eeac4334f94682056d0cb3b': Fix layoutlib [DO NOT MERGE]
| | | | | * | | | | | Merge "Fix layoutlib [DO NOT MERGE]" into jb-mr2-devDeepanshu Gupta2014-04-042-7/+19
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / /
| | | | | | * | | | | Fix layoutlib [DO NOT MERGE]Deepanshu Gupta2014-03-272-7/+19
| | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a NPE, and update an ICU method to return the right value as required by DatePicker widget. The cherry-pick differs slightly from the original to remove changes not relevant to the current branch. Bug: 11140701 Change-Id: Id92fc5359acf6dde1bcdbc781aaf637fdb6eecbf (cherry-picked from 39e75835399f4d979cf82069dae2bd1ec496fb81)
* | | | | | | | | | am 14dee803: am c7fdfe6b: am 99939cce: (-s ours) am 6094daa2: am ba0ce056: ↵Deepanshu Gupta2014-04-040-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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]
| * | | | | | | | | am c7fdfe6b: am 99939cce: (-s ours) am 6094daa2: am ba0ce056: Merge "Fix ↵Deepanshu Gupta2014-04-040-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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]
| | * | | | | | | | am 99939cce: (-s ours) am 6094daa2: am ba0ce056: Merge "Fix text size in ↵Deepanshu Gupta2014-04-040-0/+0
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev * commit '99939cce702b6b5a01be351f1a0b406a16509103': Fix text size in Fake Action Bar. [DO NOT MERGE]
| | | * | | | | | | am 6094daa2: am ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT ↵Deepanshu Gupta2014-04-041-1/+1
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE]" into jb-mr2-dev * commit '6094daa2626e57c6bd24409f0934090581541e49': Fix text size in Fake Action Bar. [DO NOT MERGE]
| | | | * | | | | | am ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into ↵Deepanshu Gupta2014-04-041-1/+1
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit 'ba0ce05688ff7ebf91e16f5cb741701feb706fc2': Fix text size in Fake Action Bar. [DO NOT MERGE]
generated by cgit v1.1 at 2025-03-26 19:25:46 +0000