Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 649da9b5: am 5a47a9f6: Merge "Native Runtime: Add LOG_ID_CRASH" | Mark Salyzyn | 2014-04-18 | 2 | -4/+10 |
|\ | |||||
| * | Merge "Native Runtime: Add LOG_ID_CRASH" | Mark Salyzyn | 2014-04-18 | 2 | -4/+10 |
| |\ | |||||
| | * | Native Runtime: Add LOG_ID_CRASH | Mark Salyzyn | 2014-04-15 | 2 | -4/+10 |
* | | | am d09e1bff: am ed5b8c06: am 6aeea454: Merge "docs: Added the play from searc... | Ricardo Cervera | 2014-04-18 | 1 | -8/+12 |
|\ \ \ | |||||
| * \ \ | am ed5b8c06: am 6aeea454: Merge "docs: Added the play from search intent. Bug... | Ricardo Cervera | 2014-04-18 | 1 | -8/+12 |
| |\ \ \ | |||||
| | * \ \ | am 6aeea454: Merge "docs: Added the play from search intent. Bug: 13473141." ... | Ricardo Cervera | 2014-04-18 | 1 | -8/+12 |
| | |\ \ \ | |||||
| | | * \ \ | Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docs | Ricardo Cervera | 2014-04-18 | 1 | -8/+12 |
| | | |\ \ \ | |||||
| | | | * | | | docs: Added the play from search intent. Bug: 13473141. | Ricardo Cervera | 2014-04-17 | 1 | -8/+12 |
* | | | | | | | Merge branch 'klp-modular-dev-plus-aosp' of https://googleplex-android.google... | Michael Kolb | 2014-04-18 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | am 7423510c: am da93c60d: Merge "jni: binder ptrdiff_t compile issues" | Mark Salyzyn | 2014-04-18 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| | * | | | | | | jni: binder ptrdiff_t compile issues | Mark Salyzyn | 2014-04-17 | 1 | -2/+2 |
* | | | | | | | | am 4abbd0a6: Merge "Populate isRound from config.xml to WindowInsets" into kl... | Michael Kolb | 2014-04-18 | 4 | -1/+18 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merge "Populate isRound from config.xml to WindowInsets" into klp-modular-dev | Michael Kolb | 2014-04-18 | 4 | -1/+18 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Populate isRound from config.xml to WindowInsets | Michael Kolb | 2014-04-17 | 4 | -1/+18 |
* | | | | | | | | am 4037847c: am 73258630: Merge "jni: binder 64-bit compile issues" | Mark Salyzyn | 2014-04-17 | 1 | -9/+10 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | jni: binder 64-bit compile issues | Mark Salyzyn | 2014-04-17 | 1 | -9/+10 |
* | | | | | | | | am 2585e15e: am 72358802: am 45e74676: Merge "Don\'t reset country code once ... | Vinit Deshapnde | 2014-04-17 | 2 | -5/+0 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | am 72358802: am 45e74676: Merge "Don\'t reset country code once it is persist... | Vinit Deshapnde | 2014-04-17 | 2 | -5/+0 |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||||
| | * | | | | | | am 45e74676: Merge "Don\'t reset country code once it is persisted" into klp-dev | Vinit Deshapnde | 2014-04-17 | 2 | -5/+0 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge "Don't reset country code once it is persisted" into klp-dev | Vinit Deshapnde | 2014-04-17 | 2 | -5/+0 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | Don't reset country code once it is persisted | Vinit Deshapnde | 2014-04-17 | 2 | -5/+0 |
* | | | | | | | | | | am 8e1e4006: Merge "Add support for dynamically setting the virtual display s... | Jeff Brown | 2014-04-17 | 4 | -10/+59 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge "Add support for dynamically setting the virtual display surface." into... | Jeff Brown | 2014-04-17 | 4 | -10/+59 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Add support for dynamically setting the virtual display surface. | Jeff Brown | 2014-04-16 | 4 | -10/+59 |
| | | |_|_|_|/ / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge "Import translations. DO NOT MERGE" into klp-modular-dev | Baligh Uddin | 2014-04-17 | 56 | -8/+218 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2014-04-16 | 56 | -8/+218 |
* | | | | | | | | | | am 4980996b: Merge "Allowed custom secure-adb confirmation via Activity or Se... | Aaron Whyte | 2014-04-16 | 2 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge "Allowed custom secure-adb confirmation via Activity or Service. It use... | Aaron Whyte | 2014-04-16 | 2 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Allowed custom secure-adb confirmation via Activity or Service. | Aaron Whyte | 2014-04-16 | 2 | -3/+3 |
* | | | | | | | | | | | am 973ddaac: DO NOT MERGE Add isRound to WindowInsets | Adam Powell | 2014-04-16 | 2 | -9/+32 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | DO NOT MERGE Add isRound to WindowInsets | Adam Powell | 2014-04-16 | 2 | -9/+32 |
* | | | | | | | | | | | Fix incorrect merge conflict to klp-modular-dev-plus-aosp | Deepanshu Gupta | 2014-04-16 | 1 | -1/+1 |
* | | | | | | | | | | | am fa72a9ea: Merge "Declare VersionCodes.KITKAT_WATCH." into klp-modular-dev | Jeff Brown | 2014-04-16 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge "Declare VersionCodes.KITKAT_WATCH." into klp-modular-dev | Jeff Brown | 2014-04-16 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Declare VersionCodes.KITKAT_WATCH. | Jeff Brown | 2014-04-16 | 1 | -0/+5 |
* | | | | | | | | | | | | am 2fd3cb95: Merge "Fix ActivityContainer callback parcelling." into klp-modu... | Craig Mautner | 2014-04-16 | 3 | -5/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Merge "Fix ActivityContainer callback parcelling." into klp-modular-dev | Craig Mautner | 2014-04-16 | 3 | -5/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | Fix ActivityContainer callback parcelling. | Craig Mautner | 2014-04-16 | 3 | -5/+15 |
| * | | | | | | | | | | | jni: liblog reading error API incorrect | Mark Salyzyn | 2014-04-16 | 1 | -4/+4 |
* | | | | | | | | | | | | am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues" | Mark Salyzyn | 2014-04-16 | 3 | -10/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | frameworks: 64 bit compile issues | Mark Salyzyn | 2014-04-16 | 3 | -10/+15 |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
* | | | | | | | | | | | resolved conflicts for merge of ec6676dd to klp-modular-dev-plus-aosp | Deepanshu Gupta | 2014-04-16 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | am 86384880: am f1e71876: Fix theme/style resolution in Layoutlib [DO NOT MERGE] | Deepanshu Gupta | 2014-04-16 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | am f1e71876: Fix theme/style resolution in Layoutlib [DO NOT MERGE] | Deepanshu Gupta | 2014-04-16 | 1 | -0/+5 |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | | | |||||
| | | * | | | | | | | | Fix theme/style resolution in Layoutlib [DO NOT MERGE] | Deepanshu Gupta | 2014-04-15 | 1 | -0/+5 |
* | | | | | | | | | | | am d023360a: am 484c88c3: am 4ccc4bd5: Action bar rendering in layoutlib [DO ... | Deepanshu Gupta | 2014-04-16 | 2 | -5/+16 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | am 484c88c3: am 4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE] | Deepanshu Gupta | 2014-04-16 | 2 | -5/+16 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | / / / / | | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | am 4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE] | Deepanshu Gupta | 2014-04-16 | 2 | -5/+16 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | |||||
| | | * | | | | | | | Action bar rendering in layoutlib [DO NOT MERGE] | Deepanshu Gupta | 2014-04-15 | 2 | -5/+16 |
| | | | |_|_|/ / / | | | |/| | | | | | |||||
| | | * | | | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2014-04-02 | 1 | -8/+8 |