summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | | | | | | | am 2b3c14bf: Merge "libandroidfw: fix build error for 64-bit"Narayan Kamath2014-02-201-39/+36
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / /
| | | | * | | | | | | | | | Merge "libandroidfw: fix build error for 64-bit"Narayan Kamath2014-02-201-39/+36
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | libandroidfw: fix build error for 64-bitPatrik Bannura2014-02-201-39/+36
* | | | | | | | | | | | | | | am 5ef8d14d: am 72eff55b: am d43ad2f3: am 4c68c4ed: am 24a8e1d0: am af87e19b:...Scott Main2014-02-201-5/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | am 72eff55b: am d43ad2f3: am 4c68c4ed: am 24a8e1d0: am af87e19b: Merge "updat...Scott Main2014-02-201-5/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | am d43ad2f3: am 4c68c4ed: am 24a8e1d0: am af87e19b: Merge "update intent exam...Scott Main2014-02-201-5/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | am 4c68c4ed: am 24a8e1d0: am af87e19b: Merge "update intent examples for maps...Scott Main2014-02-201-5/+9
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / / | | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | | am 24a8e1d0: am af87e19b: Merge "update intent examples for maps bug: 1266149...Scott Main2014-02-201-5/+9
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|/ / / / / / | | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | | am af87e19b: Merge "update intent examples for maps bug: 12661490 bug: 129577...Scott Main2014-02-201-5/+9
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ Merge "update intent examples for maps bug: 12661490 bug: 12957723" into klp-...Scott Main2014-02-201-5/+9
| | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | | | update intent examples for mapsScott Main2014-02-191-5/+9
* | | | | | | | | | | | | | | | | Merge "Fix NPE in layer destruction"John Reck2014-02-201-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Fix NPE in layer destructionJohn Reck2014-02-201-1/+6
* | | | | | | | | | | | | | | | | | Merge "Update framework to enable Skia to run in debug mode."Derek Sollenberger2014-02-202-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Update framework to enable Skia to run in debug mode.Derek Sollenberger2014-02-202-2/+1
* | | | | | | | | | | | | | | | | | | Merge "Make deliverInputEvent tracing asynchronous"Michael Wright2014-02-201-13/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Make deliverInputEvent tracing asynchronousMichael Wright2014-02-191-13/+12
* | | | | | | | | | | | | | | | | | Merge "Add ability to obtain themed Drawable from Context"Deepanshu Gupta2014-02-201-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Add ability to obtain themed Drawable from ContextDeepanshu Gupta2014-02-181-0/+5
* | | | | | | | | | | | | | | | | | Merge "use min app launch time in AppLaunch perf test"Guang Zhu2014-02-201-9/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | use min app launch time in AppLaunch perf testGuang Zhu2014-02-191-9/+12
* | | | | | | | | | | | | | | | | | | Merge "Fix layer recycling for GLRenderer"John Reck2014-02-202-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Fix layer recycling for GLRendererJohn Reck2014-02-192-0/+15
* | | | | | | | | | | | | | | | | | | | Another javadoc fixRoboErik2014-02-191-2/+2
* | | | | | | | | | | | | | | | | | | | Fix build (bad javadoc reference)RoboErik2014-02-191-1/+1
* | | | | | | | | | | | | | | | | | | | Merge "Initial commit for MediaSession test app"RoboErik2014-02-2027-0/+1893
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Initial commit for MediaSession test appRoboErik2014-02-1927-0/+1893
* | | | | | | | | | | | | | | | | | | | | Merge "Allow disabling layer rotation during screenshots"Dan Stoza2014-02-204-23/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Allow disabling layer rotation during screenshotsDan Stoza2014-02-144-23/+47
* | | | | | | | | | | | | | | | | | | | | | Merge "Always redraw background display list when view is redrawn"Alan Viverette2014-02-201-11/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Always redraw background display list when view is redrawnAlan Viverette2014-02-191-11/+10
* | | | | | | | | | | | | | | | | | | | | | | Merge "Initial round of MediaSession APIs"RoboErik2014-02-2020-108/+1503
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Initial round of MediaSession APIsRoboErik2014-02-1920-108/+1503
* | | | | | | | | | | | | | | | | | | | | | | Check item type before re-binding transient state viewsAlan Viverette2014-02-191-4/+10
| |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge "Fix for reveal animated drawables"Alan Viverette2014-02-193-41/+68
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Fix for reveal animated drawablesAlan Viverette2014-02-193-41/+68
* | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-02-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-02-191-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-02-1914-57/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-02-1914-57/+31
| |/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Modify unexpected mtu debug message to print mtu"Patrick Tjin2014-02-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Modify unexpected mtu debug message to print mtuPatrick Tjin2014-02-191-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix build due to change in SystemServiceManager"Adam Lesinski2014-02-191-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Fix build due to change in SystemServiceManagerAdam Lesinski2014-02-191-6/+6
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Set default text style in layoutlib as NORMAL"Deepanshu Gupta2014-02-191-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Set default text style in layoutlib as NORMALDeepanshu Gupta2014-02-191-0/+3
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib."Deepanshu Gupta2014-02-191-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Fix sans-serif-thin and sans-serif-light fonts in layoutlib.Deepanshu Gupta2014-02-191-3/+5
| |/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | am 13c83996: am 1c532c2e: am 4b07b26e: Merge "Make UsbService optional" into ...Adam Lesinski2014-02-1910-153/+231
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | am 1c532c2e: am 4b07b26e: Merge "Make UsbService optional" into klp-modular-devAdam Lesinski2014-02-1910-153/+231
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | |