summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | * | | | | | | | | | Removed android.debug.JNITest from preloaded-classesAshok Bhat2014-03-241-1/+0
* | | | | | | | | | | | | | am 9e289d70: am 1d26a3f1: am 09e13cc5: Merge "System services detect and regi...Narayan Kamath2014-04-108-29/+72
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am 1d26a3f1: am 09e13cc5: Merge "System services detect and register app CPU ...Narayan Kamath2014-04-108-29/+72
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | am 09e13cc5: Merge "System services detect and register app CPU ABIs"Narayan Kamath2014-04-108-29/+72
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | Merge "System services detect and register app CPU ABIs"Narayan Kamath2014-04-108-29/+72
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | System services detect and register app CPU ABIsRamin Zaghi2014-04-098-29/+72
* | | | | | | | | | | | | | | resolved conflicts for merge of 286a247e to masterNarayan Kamath2014-04-106-110/+352
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | am 0fd40cb1: am 80413c9f: Merge "Re-implement native library search and copies."Narayan Kamath2014-04-106-112/+352
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | am 80413c9f: Merge "Re-implement native library search and copies."Narayan Kamath2014-04-106-112/+352
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | Merge "Re-implement native library search and copies."Narayan Kamath2014-04-106-112/+352
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / /
| | | | * | | | | | | | | | | Re-implement native library search and copies.Ramin Zaghi2014-04-096-112/+352
* | | | | | | | | | | | | | | Merge "Allow setting the active admin across users."Jessica Hummel2014-04-101-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Allow setting the active admin across users.Jessica Hummel2014-04-101-2/+9
* | | | | | | | | | | | | | | | Merge "Camera2: Add MANUAL capture intent"Zhijun He2014-04-103-2/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Camera2: Add MANUAL capture intentZhijun He2014-04-093-2/+19
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | am 54499194: am 2e8a2d20: Merge "LE: Return false if an attribute read/write ...Zhihai Xu2014-04-101-0/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | am 2e8a2d20: Merge "LE: Return false if an attribute read/write is in progres...Zhihai Xu2014-04-091-0/+60
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "LE: Return false if an attribute read/write is in progress" into klp-m...Zhihai Xu2014-04-091-0/+60
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | LE: Return false if an attribute read/write is in progressAndre Eisenbach2014-04-091-0/+60
* | | | | | | | | | | | | | | | | am 3c1c1375: am 8d31358f: Merge "Merge "NsdService does not clean up after ex...Jesse Gunsch2014-04-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | / / / / / / / / / / / / / | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | am 8d31358f: Merge "Merge "NsdService does not clean up after exiting clients...Jesse Gunsch2014-04-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Merge "Merge "NsdService does not clean up after exiting clients"" into klp-m...Jesse Gunsch2014-04-091-17/+64
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge "NsdService does not clean up after exiting clients"Dave Platt2014-04-081-17/+64
* | | | | | | | | | | | | | | | Merge "Merge hasFunctors & pushStaging into prepareTree"John Reck2014-04-1011-57/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Merge hasFunctors & pushStaging into prepareTreeJohn Reck2014-04-0911-57/+61
* | | | | | | | | | | | | | | | | Merge "Support custom views using TimePickerDialog in layoutlib"Deepanshu Gupta2014-04-091-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Support custom views using TimePickerDialog in layoutlibDeepanshu Gupta2014-04-091-0/+1
* | | | | | | | | | | | | | | | | | Merge "Update list item text appearance"Alan Viverette2014-04-0922-59/+320
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Update list item text appearanceAlan Viverette2014-04-0922-59/+320
* | | | | | | | | | | | | | | | | | | am 6fdb5e6d: resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus...Jeff Brown2014-04-090-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aospJeff Brown2014-04-095-119/+56
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "Removing duplicated code in Recents"Winson Chung2014-04-098-39/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Removing duplicated code in RecentsWinson Chung2014-04-098-39/+58
* | | | | | | | | | | | | | | | | | | | Merge "Allow for different rects when animating to a single task stack view a...Winson Chung2014-04-0910-99/+116
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Allow for different rects when animating to a single task stack view and a mu...Winson Chung2014-04-0910-99/+116
* | | | | | | | | | | | | | | | | | | | Merge "Active window not correctly computed."Svetoslav2014-04-091-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Active window not correctly computed.Svetoslav2014-04-091-1/+2
* | | | | | | | | | | | | | | | | | | | Merge "Switch DisplayListData to a staging model"John Reck2014-04-0920-440/+358
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Switch DisplayListData to a staging modelJohn Reck2014-04-0920-440/+358
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "Put suppressed notifications behind a summary notification."John Spurlock2014-04-094-65/+181
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Put suppressed notifications behind a summary notification.John Spurlock2014-04-094-65/+181
* | | | | | | | | | | | | | | | | | | | Merge "Ensure theme attributes are set appropriately"Alan Viverette2014-04-092-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Ensure theme attributes are set appropriatelyAlan Viverette2014-04-092-0/+5
| | |_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge "Update SearchIndexablesContract"Fabrice Di Meglio2014-04-091-18/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Update SearchIndexablesContractFabrice Di Meglio2014-04-091-18/+59
* | | | | | | | | | | | | | | | | | | | | Merge "Update supported Drawable tinting modes and docs"Alan Viverette2014-04-096-22/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Update supported Drawable tinting modes and docsAlan Viverette2014-04-096-22/+64
* | | | | | | | | | | | | | | | | | | | | Skip cleaning up TV service/session when the user state is not foundJae Seo2014-04-091-1/+4
* | | | | | | | | | | | | | | | | | | | | Camera2: Fix the JPEG format issuesZhijun He2014-04-092-19/+209
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge "When recording a child node into a parent, read staging projection pro...Chris Craik2014-04-092-5/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \