Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |\ | |||||
| | * | 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 | 2 | -5/+17 |
|\ \ \ | |||||
| * | | | Provide an API to set print document name. | Selim Gurun | 2014-03-17 | 2 | -5/+17 |
* | | | | am fa711a33: am d09e1bff: am ed5b8c06: am 6aeea454: Merge "docs: Added the pl... | Ricardo Cervera | 2014-04-18 | 1 | -8/+12 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | 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 |
* | | | | | | | | resolved conflict for merge from d42eeab2 to master | Michael Kolb | 2014-04-17 | 2 | -1/+14 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | am 4abbd0a6: Merge "Populate isRound from config.xml to WindowInsets" into kl... | Michael Kolb | 2014-04-18 | 2 | -1/+14 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Merge "Populate isRound from config.xml to WindowInsets" into klp-modular-dev | Michael Kolb | 2014-04-18 | 2 | -1/+14 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Populate isRound from config.xml to WindowInsets | Michael Kolb | 2014-04-17 | 2 | -1/+14 |
* | | | | | | | | | 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 "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 18a69b93: am 8e1e4006: Merge "Add support for dynamically setting the virt... | Jeff Brown | 2014-04-17 | 4 | -10/+59 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | am 8e1e4006: Merge "Add support for dynamically setting the virtual display s... | 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 |
| | | |_|/ / / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | 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 |
* | | | | | | | | | | Merge "Add RouteProviders to the new Media APIs" | RoboErik | 2014-04-17 | 2 | -4/+4 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add RouteProviders to the new Media APIs | RoboErik | 2014-04-17 | 2 | -4/+4 |
* | | | | | | | | | | | Merge "Camera2: Update sync.frameNumber tag" | Zhijun He | 2014-04-17 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Camera2: Update sync.frameNumber tag | Zhijun He | 2014-04-17 | 1 | -2/+2 |
* | | | | | | | | | | | | Merge changes Ia693f512,If3b7d41f | Raph Levien | 2014-04-17 | 1 | -0/+26 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Add elegantTextHeight text appearance attribute | Raph Levien | 2014-04-17 | 1 | -0/+26 |
* | | | | | | | | | | | | | Split Activity Transitions out of PhoneWindow. | George Mount | 2014-04-17 | 14 | -431/+1485 |
* | | | | | | | | | | | | | Allow ProfileOwner apps to manage app restrictions | Robin Lee | 2014-04-17 | 3 | -0/+70 |
* | | | | | | | | | | | | | Merge "Add missing resume() call" | John Reck | 2014-04-17 | 1 | -11/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Add missing resume() call | John Reck | 2014-04-16 | 1 | -11/+0 |
* | | | | | | | | | | | | | | Merge "Clear mIgnoreDirtyState after draw" | John Reck | 2014-04-17 | 2 | -3/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | / / / / / / / / / / / | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Clear mIgnoreDirtyState after draw | John Reck | 2014-04-16 | 2 | -3/+5 |
* | | | | | | | | | | | | | Merge "Update DNG tags." | Ruben Brunk | 2014-04-16 | 3 | -175/+301 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Update DNG tags. | Ruben Brunk | 2014-04-16 | 3 | -175/+301 |
* | | | | | | | | | | | | | | Merge "Add Preference highlighting" | Fabrice Di Meglio | 2014-04-16 | 2 | -4/+39 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Add Preference highlighting | Fabrice Di Meglio | 2014-04-16 | 2 | -4/+39 |
| | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge "Revert the revert of adding isRound to WindowInsets after early merge" | Adam Powell | 2014-04-16 | 2 | -9/+32 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Revert the revert of adding isRound to WindowInsets after early merge | Adam Powell | 2014-04-16 | 2 | -9/+32 |
* | | | | | | | | | | | | | | Merge "Revert "Add isRound to WindowInsets"" | Michael Kolb | 2014-04-16 | 2 | -32/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Revert "Add isRound to WindowInsets" | Michael Kolb | 2014-04-16 | 2 | -32/+9 |
* | | | | | | | | | | | | | | Merge "Add isRound to WindowInsets" | Michael Kolb | 2014-04-16 | 2 | -9/+32 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Add isRound to WindowInsets | Adam Powell | 2014-04-16 | 2 | -9/+32 |
* | | | | | | | | | | | | | | Merge "Class for managing the active scorer application." | Jeff Davidson | 2014-04-16 | 2 | -0/+163 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Class for managing the active scorer application. | Jeff Davidson | 2014-04-16 | 2 | -0/+163 |
* | | | | | | | | | | | | | | | resolved conflicts for merge of 3ee9dc58 to master | Jeff Brown | 2014-04-16 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | / / / / / / / / | | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |