summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* am b90e504e: am 649da9b5: am 5a47a9f6: Merge "Native Runtime: Add LOG_ID_CRASH"Mark Salyzyn2014-04-182-4/+10
|\
| * am 649da9b5: am 5a47a9f6: Merge "Native Runtime: Add LOG_ID_CRASH"Mark Salyzyn2014-04-182-4/+10
| |\
| | * Native Runtime: Add LOG_ID_CRASHMark Salyzyn2014-04-152-4/+10
* | | Merge "Provide an API to set print document name."Selim Gurun2014-04-182-5/+17
|\ \ \
| * | | Provide an API to set print document name.Selim Gurun2014-03-172-5/+17
* | | | am fa711a33: am d09e1bff: am ed5b8c06: am 6aeea454: Merge "docs: Added the pl...Ricardo Cervera2014-04-181-8/+12
|\ \ \ \ | | |/ / | |/| |
| * | | am d09e1bff: am ed5b8c06: am 6aeea454: Merge "docs: Added the play from searc...Ricardo Cervera2014-04-181-8/+12
| |\ \ \
| | * \ \ am ed5b8c06: am 6aeea454: Merge "docs: Added the play from search intent. Bug...Ricardo Cervera2014-04-181-8/+12
| | |\ \ \
| | | * \ \ am 6aeea454: Merge "docs: Added the play from search intent. Bug: 13473141." ...Ricardo Cervera2014-04-181-8/+12
| | | |\ \ \
| | | | * \ \ Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docsRicardo Cervera2014-04-181-8/+12
| | | | |\ \ \
| | | | | * | | docs: Added the play from search intent. Bug: 13473141.Ricardo Cervera2014-04-171-8/+12
* | | | | | | | resolved conflict for merge from d42eeab2 to masterMichael Kolb2014-04-172-1/+14
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 4abbd0a6: Merge "Populate isRound from config.xml to WindowInsets" into kl...Michael Kolb2014-04-182-1/+14
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Populate isRound from config.xml to WindowInsets" into klp-modular-devMichael Kolb2014-04-182-1/+14
| | |\ \ \ \ \ \
| | | * | | | | | Populate isRound from config.xml to WindowInsetsMichael Kolb2014-04-172-1/+14
* | | | | | | | | Merge "ViewGroup now applies clipBounds to its children"Selim Cinek2014-04-182-5/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ViewGroup now applies clipBounds to its childrenSelim Cinek2014-04-172-5/+23
* | | | | | | | | | Merge "Camera2 API: fix wrong logic in handling last frame number."Jianing Wei2014-04-182-35/+120
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Camera2 API: fix wrong logic in handling last frame number.Jianing Wei2014-04-172-35/+120
* | | | | | | | | | | am 18a69b93: am 8e1e4006: Merge "Add support for dynamically setting the virt...Jeff Brown2014-04-174-10/+59
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am 8e1e4006: Merge "Add support for dynamically setting the virtual display s...Jeff Brown2014-04-174-10/+59
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Add support for dynamically setting the virtual display surface.Jeff Brown2014-04-164-10/+59
| | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | am 973ddaac: DO NOT MERGE Add isRound to WindowInsetsAdam Powell2014-04-162-9/+32
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | DO NOT MERGE Add isRound to WindowInsetsAdam Powell2014-04-162-9/+32
| * | | | | | | | | Fix incorrect merge conflict to klp-modular-dev-plus-aospDeepanshu Gupta2014-04-161-1/+1
* | | | | | | | | | Merge "Add RouteProviders to the new Media APIs"RoboErik2014-04-172-4/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add RouteProviders to the new Media APIsRoboErik2014-04-172-4/+4
* | | | | | | | | | | Merge "Camera2: Update sync.frameNumber tag"Zhijun He2014-04-171-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Camera2: Update sync.frameNumber tagZhijun He2014-04-171-2/+2
* | | | | | | | | | | | Merge changes Ia693f512,If3b7d41fRaph Levien2014-04-171-0/+26
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add elegantTextHeight text appearance attributeRaph Levien2014-04-171-0/+26
* | | | | | | | | | | | | Split Activity Transitions out of PhoneWindow.George Mount2014-04-1714-431/+1485
* | | | | | | | | | | | | Allow ProfileOwner apps to manage app restrictionsRobin Lee2014-04-173-0/+70
* | | | | | | | | | | | | Merge "Add missing resume() call"John Reck2014-04-171-11/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add missing resume() callJohn Reck2014-04-161-11/+0
* | | | | | | | | | | | | | Merge "Clear mIgnoreDirtyState after draw"John Reck2014-04-172-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | / / / / / / / / / / / | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Clear mIgnoreDirtyState after drawJohn Reck2014-04-162-3/+5
* | | | | | | | | | | | | Merge "Update DNG tags."Ruben Brunk2014-04-163-175/+301
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Update DNG tags.Ruben Brunk2014-04-163-175/+301
* | | | | | | | | | | | | | Merge "Add Preference highlighting"Fabrice Di Meglio2014-04-162-4/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add Preference highlightingFabrice Di Meglio2014-04-162-4/+39
| | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Revert the revert of adding isRound to WindowInsets after early merge"Adam Powell2014-04-162-9/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Revert the revert of adding isRound to WindowInsets after early mergeAdam Powell2014-04-162-9/+32
* | | | | | | | | | | | | | Merge "Revert "Add isRound to WindowInsets""Michael Kolb2014-04-162-32/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Revert "Add isRound to WindowInsets"Michael Kolb2014-04-162-32/+9
* | | | | | | | | | | | | | Merge "Add isRound to WindowInsets"Michael Kolb2014-04-162-9/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Add isRound to WindowInsetsAdam Powell2014-04-162-9/+32
* | | | | | | | | | | | | | Merge "Class for managing the active scorer application."Jeff Davidson2014-04-162-0/+163
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Class for managing the active scorer application.Jeff Davidson2014-04-162-0/+163
* | | | | | | | | | | | | | | resolved conflicts for merge of 3ee9dc58 to masterJeff Brown2014-04-161-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | / / / / / / / / | | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |