Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | Rename vmData | Anwar Ghuloum | 2013-07-09 | 1 | -3/+3 | |
* | | | | | | | | | | | | | am accb2c4f: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge | The Android Open Source Project | 2013-07-08 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Reconcile with jb-mr2-zeroday-release - do not merge | The Android Open Source Project | 2013-07-08 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | | merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev | The Android Automerger | 2013-07-08 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
* | | \ \ \ \ \ \ \ \ \ \ \ | am c4663b24: am bd6f9b60: am 5288ef70: (-s ours) resolved conflicts for merge... | Alex Klyubin | 2013-07-08 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | am bd6f9b60: am 5288ef70: (-s ours) resolved conflicts for merge of 1cec2593 ... | Alex Klyubin | 2013-07-08 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | am 5288ef70: (-s ours) resolved conflicts for merge of 1cec2593 to jb-mr1-dev... | Alex Klyubin | 2013-07-08 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | / / / / / / | | | | |_|_|_|/ / / / / / | | | |/| | | | | | | | | | ||||||
| | | * | | | | | | | | | | resolved conflicts for merge of 1cec2593 to jb-mr1-dev-plus-aosp | Alex Klyubin | 2013-07-08 | 2 | -7/+7 | |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / | | | | |/| | | | | | | | | ||||||
| | | | * | | | | | | | | | am bcb7b420: am d987149f: am 3802bbcf: am fe39951e: Values in ZIP files are u... | Elliott Hughes | 2013-07-08 | 2 | -7/+7 | |
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|/ / / / | | | | | |/| | | | | | | | ||||||
| | | | | * | | | | | | | | am d987149f: am 3802bbcf: am fe39951e: Values in ZIP files are unsigned. | Elliott Hughes | 2013-07-08 | 2 | -7/+7 | |
| | | | | |\ \ \ \ \ \ \ \ | | | | | | | |_|_|_|/ / / | | | | | | |/| | | | | | | ||||||
| | | | | | * | | | | | | | am 3802bbcf: am fe39951e: Values in ZIP files are unsigned. | Elliott Hughes | 2013-07-08 | 2 | -7/+7 | |
| | | | | | |\ \ \ \ \ \ \ | | | | | | | | |_|_|_|/ / | | | | | | | |/| | | | | | ||||||
| | | | | | | * | | | | | | am fe39951e: Values in ZIP files are unsigned. | Elliott Hughes | 2013-07-08 | 2 | -7/+7 | |
| | | | | | | |\ \ \ \ \ \ | | | | | | | | | |_|_|_|/ | | | | | | | | |/| | | | | ||||||
| | | | | | | | * | | | | | Values in ZIP files are unsigned. | Elliott Hughes | 2013-07-03 | 2 | -7/+7 | |
* | | | | | | | | | | | | | am 5c586990: am 9b0e19a4: am 1e1804d8: Merge "Permit content lengths greater ... | Elliott Hughes | 2013-07-08 | 1 | -8/+25 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | am 9b0e19a4: am 1e1804d8: Merge "Permit content lengths greater than 2 GiB" | Elliott Hughes | 2013-07-08 | 1 | -8/+25 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | | am 1e1804d8: Merge "Permit content lengths greater than 2 GiB" | Elliott Hughes | 2013-07-08 | 1 | -8/+25 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | ||||||
| | | * | | | | | | | | | | Merge "Permit content lengths greater than 2 GiB" | Elliott Hughes | 2013-07-08 | 1 | -8/+25 | |
| | | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | Permit content lengths greater than 2 GiB | jwilson | 2013-07-05 | 1 | -8/+25 | |
* | | | | | | | | | | | | | | am 420a9731: am 7f649edc: Values in ZIP files are unsigned. | Elliott Hughes | 2013-07-03 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | am 7f649edc: Values in ZIP files are unsigned. | Elliott Hughes | 2013-07-03 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Values in ZIP files are unsigned. | Elliott Hughes | 2013-07-03 | 2 | -9/+9 | |
* | | | | | | | | | | | | | | am abdba198: am 79ea6206: am 995537af: Merge "Values in ZIP files are unsigned." | Elliott Hughes | 2013-07-03 | 2 | -9/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | am 79ea6206: am 995537af: Merge "Values in ZIP files are unsigned." | Elliott Hughes | 2013-07-03 | 2 | -9/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | am 995537af: Merge "Values in ZIP files are unsigned." | Elliott Hughes | 2013-07-03 | 2 | -9/+9 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | Merge "Values in ZIP files are unsigned." | Elliott Hughes | 2013-07-03 | 2 | -9/+9 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | Values in ZIP files are unsigned. | Elliott Hughes | 2013-07-03 | 2 | -9/+9 | |
| | | |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | am 182cba6c: am 263e4e73: am 10d1f630: Merge "Fix Character.isWhitespace and ... | Elliott Hughes | 2013-07-03 | 2 | -45/+118 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | am 263e4e73: am 10d1f630: Merge "Fix Character.isWhitespace and Character.isS... | Elliott Hughes | 2013-07-03 | 2 | -45/+118 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | am 10d1f630: Merge "Fix Character.isWhitespace and Character.isSpaceChar." | Elliott Hughes | 2013-07-03 | 2 | -45/+118 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | Merge "Fix Character.isWhitespace and Character.isSpaceChar." | Elliott Hughes | 2013-07-03 | 2 | -45/+118 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | Fix Character.isWhitespace and Character.isSpaceChar. | Elliott Hughes | 2013-07-03 | 2 | -45/+118 | |
* | | | | | | | | | | | | | | | am 25a5da55: am fdbe0b8e: am a2b1f08f: Merge "Fix unexpected EOF handling by ... | Elliott Hughes | 2013-07-03 | 2 | -5/+49 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | am fdbe0b8e: am a2b1f08f: Merge "Fix unexpected EOF handling by KXmlParser." | Elliott Hughes | 2013-07-03 | 2 | -5/+49 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | am a2b1f08f: Merge "Fix unexpected EOF handling by KXmlParser." | Elliott Hughes | 2013-07-03 | 2 | -5/+49 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | Merge "Fix unexpected EOF handling by KXmlParser." | Elliott Hughes | 2013-07-03 | 2 | -5/+49 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | Fix unexpected EOF handling by KXmlParser. | Vladimir Marko | 2013-06-28 | 2 | -5/+49 | |
* | | | | | | | | | | | | | | | am 37c89726: am 7381513b: am fee8ca27: Merge "Add a definition for IPPROTO_IC... | Elliott Hughes | 2013-07-03 | 2 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | am 7381513b: am fee8ca27: Merge "Add a definition for IPPROTO_ICMPV6." | Elliott Hughes | 2013-07-03 | 2 | -0/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | am fee8ca27: Merge "Add a definition for IPPROTO_ICMPV6." | Elliott Hughes | 2013-07-03 | 2 | -0/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | Merge "Add a definition for IPPROTO_ICMPV6." | Elliott Hughes | 2013-07-03 | 2 | -0/+2 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | Add a definition for IPPROTO_ICMPV6. | Lorenzo Colitti | 2013-07-03 | 2 | -0/+2 | |
| | | |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | am 5aa8462d: am 4cd0c935: am 1962abb0: Merge "Retire the java.nio.charset.Cha... | Elliott Hughes | 2013-07-02 | 1 | -20/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | am 4cd0c935: am 1962abb0: Merge "Retire the java.nio.charset.Charsets Charset... | Elliott Hughes | 2013-07-02 | 1 | -20/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | am 1962abb0: Merge "Retire the java.nio.charset.Charsets Charset constants." | Elliott Hughes | 2013-07-02 | 1 | -20/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | Merge "Retire the java.nio.charset.Charsets Charset constants." | Elliott Hughes | 2013-07-02 | 1 | -20/+1 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | Retire the java.nio.charset.Charsets Charset constants. | Elliott Hughes | 2013-07-02 | 1 | -20/+1 | |
| | | |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Revert "Rename vmData" | Anwar Ghuloum | 2013-07-02 | 1 | -3/+3 | |
* | | | | | | | | | | | | | | | Rename vmData | Anwar Ghuloum | 2013-07-02 | 1 | -3/+3 | |
* | | | | | | | | | | | | | | | Ensure that setName and setPriority are properly synchronized | Anwar Ghuloum | 2013-07-02 | 1 | -4/+17 | |
* | | | | | | | | | | | | | | | Fix mac build | Anwar Ghuloum | 2013-07-02 | 1 | -3/+3 |