summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Zen: Maintain source filters for both calls and messages." into mnc-devJohn Spurlock2015-05-063-49/+76
|\
| * Zen: Maintain source filters for both calls and messages.John Spurlock2015-05-053-49/+76
* | Merge "Remove unused aapt target." into mnc-devChih-Hung Hsieh2015-05-061-24/+0
|\ \
| * | Remove unused aapt target.Chih-Hung Hsieh2015-05-061-24/+0
* | | Merge "Permission policies are for profile and device owners" into mnc-devAmith Yamasani2015-05-061-2/+2
|\ \ \
| * | | Permission policies are for profile and device ownersAmith Yamasani2015-05-051-2/+2
* | | | am 79f12bb6: am d967fcbe: am e9f17cda: docs: Overhaul of the RenderScript ref...Jean-Luc Brouillet2015-05-0579-19041/+25714
|\ \ \ \
| * \ \ \ am d967fcbe: am e9f17cda: docs: Overhaul of the RenderScript reference docume...Jean-Luc Brouillet2015-05-0579-19041/+25714
| |\ \ \ \
| | * \ \ \ am e9f17cda: docs: Overhaul of the RenderScript reference documentation.Jean-Luc Brouillet2015-05-0579-19041/+25714
| | |\ \ \ \
| | | * | | | docs: Overhaul of the RenderScript reference documentation.Jean-Luc Brouillet2015-05-0579-19041/+25714
* | | | | | | Merge "Fixed a measuring bug when the panel was collapsed" into mnc-devSelim Cinek2015-05-051-9/+1
|\ \ \ \ \ \ \
| * | | | | | | Fixed a measuring bug when the panel was collapsedSelim Cinek2015-05-051-9/+1
* | | | | | | | Merge "Enforcing the touchslop now when flinging open before intercepting" in...Selim Cinek2015-05-051-4/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Enforcing the touchslop now when flinging open before interceptingSelim Cinek2015-05-051-4/+8
* | | | | | | | Merge "Fixed a bug where the notifications would jump when going to the full ...Selim Cinek2015-05-051-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Fixed a bug where the notifications would jump when going to the full shadeSelim Cinek2015-05-051-1/+1
* | | | | | | | Merge "Extended test to support launching assist above lock screen" into mnc-devSelim Cinek2015-05-055-2/+118
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Extended test to support launching assist above lock screenSelim Cinek2015-05-055-2/+118
* | | | | | | | Merge "The voice assist may now be launched above the lockscreen" into mnc-devSelim Cinek2015-05-0520-83/+361
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | The voice assist may now be launched above the lockscreenSelim Cinek2015-05-0520-83/+361
* | | | | | | | Merge "Disable VT over IMS feature." into mnc-devEtan Cohen2015-05-051-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Disable VT over IMS feature.Etan Cohen2015-05-051-1/+1
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge "TIF: Make all the parameters for UNRATED null" into mnc-devJae Seo2015-05-053-10/+17
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | TIF: Make all the parameters for UNRATED nullJae Seo2015-05-053-10/+17
* | | | | | | | Merge "Clean up error handling in CopyService." into mnc-devBen Kwa2015-05-051-7/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Clean up error handling in CopyService.Ben Kwa2015-05-051-7/+5
* | | | | | | | | Make sure fingerprint error messages are handled in KeyguardJorim Jaggi2015-05-051-1/+1
* | | | | | | | | Merge "Cleanup properties" into mnc-devChris Craik2015-05-0526-324/+329
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Cleanup propertiesChris Craik2015-05-0526-324/+329
* | | | | | | | | Merge "Dump profile info after running test" into mnc-devJohn Reck2015-05-055-6/+54
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Dump profile info after running testJohn Reck2015-05-055-6/+54
* | | | | | | | | | Merge "WiFi Calling: Show different operator name string in Data usage dialog...Pavel Zhamaitsiak2015-05-057-6/+31
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | WiFi Calling: Show different operator name string in Data usage dialog.Pavel Zhamaitsiak2015-05-057-6/+31
* | | | | | | | | | | Merge "Hide lockscreen contents from a11y while bouncer is showing" into mnc-devAdrian Roos2015-05-052-0/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Hide lockscreen contents from a11y while bouncer is showingAdrian Roos2015-04-292-0/+9
* | | | | | | | | | | | Merge "Only enable fingerprint auth after first regular auth" into mnc-devJorim Jaggi2015-05-054-16/+70
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Only enable fingerprint auth after first regular authJorim Jaggi2015-05-054-16/+70
* | | | | | | | | | | | | Merge "Volume A11y: Prevent auto-dismiss when feedback enabled." into mnc-devJohn Spurlock2015-05-052-4/+78
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Volume A11y: Prevent auto-dismiss when feedback enabled.John Spurlock2015-05-052-4/+78
* | | | | | | | | | | | | | Merge "Fix binder force gc will block binder thread" into mnc-devHiroshi Yamauchi2015-05-051-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix binder force gc will block binder threadHiroshi Yamauchi2015-05-051-1/+3
* | | | | | | | | | | | | | Merge "Update permissions on memory usage instrumentation" into mnc-devPrabhakar Thirumoorthy2015-05-051-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Update permissions on memory usage instrumentationMaxim Siniavine2015-05-051-1/+3
* | | | | | | | | | | | | | Merge "Cherry pick beefed-up error handling in the CopyService from master. ...Ben Kwa2015-05-053-156/+265
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Cherry pick beefed-up error handling in the CopyService from master. DO NOT ...Ben Kwa2015-05-043-156/+265
* | | | | | | | | | | | | | | am a4d0e528: am d8039f04: am 79167534: am c1174104: am fbd4af0f: Merge "Docs:...Andrew Solovay2015-05-050-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | am d8039f04: am 79167534: am c1174104: am fbd4af0f: Merge "Docs: New swipe-to...Andrew Solovay2015-05-050-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ am 79167534: am c1174104: am fbd4af0f: Merge "Docs: New swipe-to-refresh trai...Andrew Solovay2015-05-056-1/+402
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ am c1174104: am fbd4af0f: Merge "Docs: New swipe-to-refresh training guide." ...Andrew Solovay2015-05-046-1/+402
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ am fbd4af0f: Merge "Docs: New swipe-to-refresh training guide." into lmp-docsAndrew Solovay2015-05-046-1/+402
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \