Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Add convenience methods to encourage usage of ALL_SAVE_FLAG" | Chris Craik | 2014-04-18 | 2 | -17/+38 |
|\ | |||||
| * | Add convenience methods to encourage usage of ALL_SAVE_FLAG | Chris Craik | 2014-04-17 | 2 | -17/+38 |
* | | am 235fd3c9: am d5ed804f: am a7b62718: am 974588d1: Merge "docs: Watermarked ... | Ricardo Cervera | 2014-04-18 | 5 | -0/+0 |
|\ \ | |||||
| * \ | am d5ed804f: am a7b62718: am 974588d1: Merge "docs: Watermarked images for co... | Ricardo Cervera | 2014-04-18 | 5 | -0/+0 |
| |\ \ | |||||
| | * \ | am a7b62718: am 974588d1: Merge "docs: Watermarked images for codes that were... | Ricardo Cervera | 2014-04-18 | 5 | -0/+0 |
| | |\ \ | |||||
| | | * \ | am 974588d1: Merge "docs: Watermarked images for codes that weren\'t found." ... | Ricardo Cervera | 2014-04-18 | 5 | -0/+0 |
| | | |\ \ | |||||
| | | | * \ | Merge "docs: Watermarked images for codes that weren't found." into klp-docs | Ricardo Cervera | 2014-04-18 | 5 | -0/+0 |
| | | | |\ \ | |||||
| | | | | * | | docs: Watermarked images for codes that weren't found. | Ricardo Cervera | 2014-04-18 | 5 | -0/+0 |
* | | | | | | | am 15d1feb0: am fed2c410: am 4874938a: am 84e6bc61: Merge "Revert "docs: Wate... | Ricardo Cervera-Navarro | 2014-04-18 | 25 | -0/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am fed2c410: am 4874938a: am 84e6bc61: Merge "Revert "docs: Watermark images ... | Ricardo Cervera-Navarro | 2014-04-18 | 25 | -0/+0 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | am 4874938a: am 84e6bc61: Merge "Revert "docs: Watermark images with easter e... | Ricardo Cervera-Navarro | 2014-04-18 | 25 | -0/+0 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | am 84e6bc61: Merge "Revert "docs: Watermark images with easter eggs"" into kl... | Ricardo Cervera-Navarro | 2014-04-18 | 25 | -0/+0 |
| | | |\ \ \ \ | | | | |/ / / | |||||
| | | | * | | | Merge "Revert "docs: Watermark images with easter eggs"" into klp-docs | Ricardo Cervera-Navarro | 2014-04-18 | 25 | -0/+0 |
| | | | |\ \ \ | | | | | |/ / | | | | |/| | | |||||
| | | | | * | | Revert "docs: Watermark images with easter eggs" | Ricardo Cervera-Navarro | 2014-04-18 | 25 | -0/+0 |
* | | | | | | | Merge "Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs." | Ying Wang | 2014-04-18 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use LOCAL_JNI_SHARED_LIBRARIES to install JNI libs. | Ying Wang | 2014-04-17 | 2 | -2/+2 |
* | | | | | | | | am b90e504e: am 649da9b5: am 5a47a9f6: Merge "Native Runtime: Add LOG_ID_CRASH" | Mark Salyzyn | 2014-04-18 | 2 | -4/+10 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | am 649da9b5: am 5a47a9f6: Merge "Native Runtime: Add LOG_ID_CRASH" | Mark Salyzyn | 2014-04-18 | 2 | -4/+10 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | 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 |
* | | | | | | | | | | | Merge "Provide an API to set print document name." | Selim Gurun | 2014-04-18 | 3 | -6/+19 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Provide an API to set print document name. | Selim Gurun | 2014-03-17 | 3 | -6/+19 |
* | | | | | | | | | | | | Merge "Force a full redraw on surface change" | John Reck | 2014-04-18 | 1 | -8/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Force a full redraw on surface change | John Reck | 2014-04-17 | 1 | -8/+11 |
* | | | | | | | | | | | | | am fa711a33: am d09e1bff: am ed5b8c06: am 6aeea454: Merge "docs: Added the pl... | Ricardo Cervera | 2014-04-18 | 2 | -8/+255 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | am d09e1bff: am ed5b8c06: am 6aeea454: Merge "docs: Added the play from searc... | Ricardo Cervera | 2014-04-18 | 2 | -8/+255 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | am ed5b8c06: am 6aeea454: Merge "docs: Added the play from search intent. Bug... | Ricardo Cervera | 2014-04-18 | 2 | -8/+255 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | | am 6aeea454: Merge "docs: Added the play from search intent. Bug: 13473141." ... | Ricardo Cervera | 2014-04-18 | 2 | -8/+255 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / | | | | |/| | | | | | | | | |||||
| | | | * | | | | | | | | | Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docs | Ricardo Cervera | 2014-04-18 | 2 | -8/+255 |
| | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | | docs: Added the play from search intent. Bug: 13473141. | Ricardo Cervera | 2014-04-17 | 2 | -8/+255 |
* | | | | | | | | | | | | | | am 7d755a6f: Merge branch \'klp-modular-dev-plus-aosp\' of https://googleplex... | Michael Kolb | 2014-04-18 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | 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 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | am da93c60d: Merge "jni: binder ptrdiff_t compile issues" | Mark Salyzyn | 2014-04-18 | 1 | -2/+2 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / / / | | | | |/| | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | 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 |
| | | | |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | resolved conflict for merge from d42eeab2 to master | Michael Kolb | 2014-04-17 | 4 | -1/+18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | 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 |
* | | | | | | | | | | | | | | | Merge "ViewGroup now applies clipBounds to its children" | Selim Cinek | 2014-04-18 | 2 | -5/+23 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | ViewGroup now applies clipBounds to its children | Selim Cinek | 2014-04-17 | 2 | -5/+23 |
* | | | | | | | | | | | | | | | | Merge "Revert "Fix broken status bar when activity is showing above keyguard"" | John Spurlock | 2014-04-18 | 1 | -12/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | Revert "Fix broken status bar when activity is showing above keyguard" | John Spurlock | 2014-04-17 | 1 | -12/+2 |
* | | | | | | | | | | | | | | | | | Merge "Support per-package lib dirs for bundled apps" | Christopher Tate | 2014-04-18 | 1 | -3/+29 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | Support per-package lib dirs for bundled apps | Christopher Tate | 2014-04-17 | 1 | -3/+29 |
* | | | | | | | | | | | | | | | | | | Merge "Camera2 API: fix wrong logic in handling last frame number." | Jianing Wei | 2014-04-18 | 2 | -35/+120 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | Camera2 API: fix wrong logic in handling last frame number. | Jianing Wei | 2014-04-17 | 2 | -35/+120 |
* | | | | | | | | | | | | | | | | | | | am dc500d2d: am 4037847c: am 73258630: Merge "jni: binder 64-bit compile issues" | Mark Salyzyn | 2014-04-17 | 1 | -9/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |