Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | | * | | | | | | | | | | Removed android.debug.JNITest from preloaded-classes | Ashok Bhat | 2014-03-24 | 1 | -1/+0 | |
* | | | | | | | | | | | | | | am 9e289d70: am 1d26a3f1: am 09e13cc5: Merge "System services detect and regi... | Narayan Kamath | 2014-04-10 | 8 | -29/+72 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | am 1d26a3f1: am 09e13cc5: Merge "System services detect and register app CPU ... | Narayan Kamath | 2014-04-10 | 8 | -29/+72 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | am 09e13cc5: Merge "System services detect and register app CPU ABIs" | Narayan Kamath | 2014-04-10 | 8 | -29/+72 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | Merge "System services detect and register app CPU ABIs" | Narayan Kamath | 2014-04-10 | 8 | -29/+72 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | System services detect and register app CPU ABIs | Ramin Zaghi | 2014-04-09 | 8 | -29/+72 | |
* | | | | | | | | | | | | | | | resolved conflicts for merge of 286a247e to master | Narayan Kamath | 2014-04-10 | 6 | -110/+352 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | am 0fd40cb1: am 80413c9f: Merge "Re-implement native library search and copies." | Narayan Kamath | 2014-04-10 | 6 | -112/+352 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | am 80413c9f: Merge "Re-implement native library search and copies." | Narayan Kamath | 2014-04-10 | 6 | -112/+352 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | Merge "Re-implement native library search and copies." | Narayan Kamath | 2014-04-10 | 6 | -112/+352 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | ||||||
| | | | * | | | | | | | | | | | Re-implement native library search and copies. | Ramin Zaghi | 2014-04-09 | 6 | -112/+352 | |
* | | | | | | | | | | | | | | | Merge "Allow setting the active admin across users." | Jessica Hummel | 2014-04-10 | 1 | -2/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Allow setting the active admin across users. | Jessica Hummel | 2014-04-10 | 1 | -2/+9 | |
* | | | | | | | | | | | | | | | | Merge "Camera2: Add MANUAL capture intent" | Zhijun He | 2014-04-10 | 3 | -2/+19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Camera2: Add MANUAL capture intent | Zhijun He | 2014-04-09 | 3 | -2/+19 | |
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | am 54499194: am 2e8a2d20: Merge "LE: Return false if an attribute read/write ... | Zhihai Xu | 2014-04-10 | 1 | -0/+60 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | am 2e8a2d20: Merge "LE: Return false if an attribute read/write is in progres... | Zhihai Xu | 2014-04-09 | 1 | -0/+60 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | Merge "LE: Return false if an attribute read/write is in progress" into klp-m... | Zhihai Xu | 2014-04-09 | 1 | -0/+60 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | LE: Return false if an attribute read/write is in progress | Andre Eisenbach | 2014-04-09 | 1 | -0/+60 | |
* | | | | | | | | | | | | | | | | | am 3c1c1375: am 8d31358f: Merge "Merge "NsdService does not clean up after ex... | Jesse Gunsch | 2014-04-10 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | / / / / / / / / / / / / / | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | am 8d31358f: Merge "Merge "NsdService does not clean up after exiting clients... | Jesse Gunsch | 2014-04-09 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | Merge "Merge "NsdService does not clean up after exiting clients"" into klp-m... | Jesse Gunsch | 2014-04-09 | 1 | -17/+64 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | Merge "NsdService does not clean up after exiting clients" | Dave Platt | 2014-04-08 | 1 | -17/+64 | |
* | | | | | | | | | | | | | | | | Merge "Merge hasFunctors & pushStaging into prepareTree" | John Reck | 2014-04-10 | 11 | -57/+61 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Merge hasFunctors & pushStaging into prepareTree | John Reck | 2014-04-09 | 11 | -57/+61 | |
* | | | | | | | | | | | | | | | | | Merge "Support custom views using TimePickerDialog in layoutlib" | Deepanshu Gupta | 2014-04-09 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | Support custom views using TimePickerDialog in layoutlib | Deepanshu Gupta | 2014-04-09 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | | | | | Merge "Update list item text appearance" | Alan Viverette | 2014-04-09 | 22 | -59/+320 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | Update list item text appearance | Alan Viverette | 2014-04-09 | 22 | -59/+320 | |
* | | | | | | | | | | | | | | | | | | | am 6fdb5e6d: resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus... | Jeff Brown | 2014-04-09 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp | Jeff Brown | 2014-04-09 | 5 | -119/+56 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge "Removing duplicated code in Recents" | Winson Chung | 2014-04-09 | 8 | -39/+58 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | Removing duplicated code in Recents | Winson Chung | 2014-04-09 | 8 | -39/+58 | |
* | | | | | | | | | | | | | | | | | | | | Merge "Allow for different rects when animating to a single task stack view a... | Winson Chung | 2014-04-09 | 10 | -99/+116 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | Allow for different rects when animating to a single task stack view and a mu... | Winson Chung | 2014-04-09 | 10 | -99/+116 | |
* | | | | | | | | | | | | | | | | | | | | Merge "Active window not correctly computed." | Svetoslav | 2014-04-09 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | Active window not correctly computed. | Svetoslav | 2014-04-09 | 1 | -1/+2 | |
* | | | | | | | | | | | | | | | | | | | | Merge "Switch DisplayListData to a staging model" | John Reck | 2014-04-09 | 20 | -440/+358 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | Switch DisplayListData to a staging model | John Reck | 2014-04-09 | 20 | -440/+358 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge "Put suppressed notifications behind a summary notification." | John Spurlock | 2014-04-09 | 4 | -65/+181 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | Put suppressed notifications behind a summary notification. | John Spurlock | 2014-04-09 | 4 | -65/+181 | |
* | | | | | | | | | | | | | | | | | | | | Merge "Ensure theme attributes are set appropriately" | Alan Viverette | 2014-04-09 | 2 | -0/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | Ensure theme attributes are set appropriately | Alan Viverette | 2014-04-09 | 2 | -0/+5 | |
| | |_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge "Update SearchIndexablesContract" | Fabrice Di Meglio | 2014-04-09 | 1 | -18/+59 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | Update SearchIndexablesContract | Fabrice Di Meglio | 2014-04-09 | 1 | -18/+59 | |
* | | | | | | | | | | | | | | | | | | | | | Merge "Update supported Drawable tinting modes and docs" | Alan Viverette | 2014-04-09 | 6 | -22/+64 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | Update supported Drawable tinting modes and docs | Alan Viverette | 2014-04-09 | 6 | -22/+64 | |
* | | | | | | | | | | | | | | | | | | | | | Skip cleaning up TV service/session when the user state is not found | Jae Seo | 2014-04-09 | 1 | -1/+4 | |
* | | | | | | | | | | | | | | | | | | | | | Camera2: Fix the JPEG format issues | Zhijun He | 2014-04-09 | 2 | -19/+209 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge "When recording a child node into a parent, read staging projection pro... | Chris Craik | 2014-04-09 | 2 | -5/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |