summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "AudioTrack constructor/set parameter frameCount is size_t"Glenn Kasten2014-02-281-1/+1
|\
| * AudioTrack constructor/set parameter frameCount is size_tGlenn Kasten2014-02-271-1/+1
* | Merge "Fix bad link tag in javadoc."Narayan Kamath2014-02-281-1/+1
|\ \
| * | Fix bad link tag in javadoc.Narayan Kamath2014-02-281-1/+1
* | | am d8ccf8b7: am be094d89: am 8fb22ae7: am eee2c72f: Merge "Various format str...Narayan Kamath2014-02-282-6/+7
|\ \ \
| * \ \ am be094d89: am 8fb22ae7: am eee2c72f: Merge "Various format string fixes for...Narayan Kamath2014-02-282-6/+7
| |\ \ \
| | * \ \ am 8fb22ae7: am eee2c72f: Merge "Various format string fixes for 64bit"Narayan Kamath2014-02-282-6/+7
| | |\ \ \
| | | * \ \ am eee2c72f: Merge "Various format string fixes for 64bit"Narayan Kamath2014-02-282-6/+7
| | | |\ \ \
| | | | * \ \ Merge "Various format string fixes for 64bit"Narayan Kamath2014-02-282-6/+7
| | | | |\ \ \
| | | | | * | | Various format string fixes for 64bitKévin PETIT2014-02-242-6/+7
* | | | | | | | am 62d675c2: am 0d3548be: am d138029d: am 14420e29: Merge "AArch64: Use long[...Narayan Kamath2014-02-2810-151/+215
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | / / | |_|_|_|_|/ / |/| | | | | |
| * | | | | | am 0d3548be: am d138029d: am 14420e29: Merge "AArch64: Use long[] for RS id a...Narayan Kamath2014-02-2810-151/+215
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am d138029d: am 14420e29: Merge "AArch64: Use long[] for RS id array"Narayan Kamath2014-02-2810-151/+215
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | am 14420e29: Merge "AArch64: Use long[] for RS id array"Narayan Kamath2014-02-2810-151/+215
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Merge "AArch64: Use long[] for RS id array"Narayan Kamath2014-02-2810-151/+215
| | | | |\ \ \
| | | | | * | | AArch64: Use long[] for RS id arrayAshok Bhat2014-02-1210-151/+215
* | | | | | | | Merge "Fix includes so that they no longer rely on the global Skia includes d...Derek Sollenberger2014-02-2810-19/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix includes so that they no longer rely on the global Skia includes director...Derek Sollenberger2014-02-2710-19/+10
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge "API changes for 64 bit platforms."Narayan Kamath2014-02-282-17/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | API changes for 64 bit platforms.Narayan Kamath2014-02-272-17/+18
* | | | | | | | | am 098bed6f: am bb689496: am 4c7e6900: Make meaning of PowerManager.isScreenO...Jeff Brown2014-02-281-8/+9
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | am bb689496: am 4c7e6900: Make meaning of PowerManager.isScreenOn() more cons...Jeff Brown2014-02-281-8/+9
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | am 4c7e6900: Make meaning of PowerManager.isScreenOn() more consistent.Jeff Brown2014-02-281-8/+9
| | |\ \ \ \ \ \ \
| | | * | | | | | | Make meaning of PowerManager.isScreenOn() more consistent.Jeff Brown2014-02-271-8/+9
* | | | | | | | | | Merge "Refactor smooth scrolling sub-row calculation and clamp target"Alan Viverette2014-02-281-57/+58
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Refactor smooth scrolling sub-row calculation and clamp targetAlan Viverette2014-02-271-57/+58
* | | | | | | | | | | am b2334254: am ec84ada6: am 5e5602da: am 0c72b769: Merge "Update layoutlib m...Xavier Ducrohet2014-02-271-5/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am ec84ada6: am 5e5602da: am 0c72b769: Merge "Update layoutlib method for Sys...Xavier Ducrohet2014-02-271-5/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | am 5e5602da: am 0c72b769: Merge "Update layoutlib method for SystemClock"Xavier Ducrohet2014-02-271-5/+0
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | |
| | | * | | | | | | | am 0c72b769: Merge "Update layoutlib method for SystemClock"Xavier Ducrohet2014-02-271-5/+0
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / | | | | |/| | | | | |
| | | | * | | | | | | Merge "Update layoutlib method for SystemClock"Xavier Ducrohet2014-02-271-5/+0
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Update layoutlib method for SystemClockDeepanshu Gupta2014-02-241-5/+0
| | | | | | |_|_|_|_|/ | | | | | |/| | | | |
* | | | | | | | | | | Merge "Add tests to the layoutlib eclipse project."Deepanshu Gupta2014-02-271-1/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add tests to the layoutlib eclipse project.Deepanshu Gupta2014-02-271-1/+3
* | | | | | | | | | | am 8ba12779: am 43e412cb: am 1dd01130: am e2b220e8: am 0619edd3: am 7ab82a0c:...Paul Lawrence2014-02-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am 43e412cb: am 1dd01130: am e2b220e8: am 0619edd3: am 7ab82a0c: am 657dbc40:...Paul Lawrence2014-02-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | am 1dd01130: am e2b220e8: am 0619edd3: am 7ab82a0c: am 657dbc40: am b3776881:...Paul Lawrence2014-02-270-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | |
| | | * | | | | | | | am e2b220e8: am 0619edd3: am 7ab82a0c: am 657dbc40: am b3776881: am 8b916936:...Paul Lawrence2014-02-270-0/+0
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ am 0619edd3: am 7ab82a0c: am 657dbc40: am b3776881: am 8b916936: am 2e582d13:...Paul Lawrence2014-02-270-0/+0
| | | | |\ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ am 7ab82a0c: am 657dbc40: am b3776881: am 8b916936: am 2e582d13: am 9bce4032:...Paul Lawrence2014-02-270-0/+0
| | | | | |\ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ am 657dbc40: am b3776881: am 8b916936: am 2e582d13: am 9bce4032: am 08ee74b1:...Paul Lawrence2014-02-270-0/+0
| | | | | | |\ \ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ \ am b3776881: am 8b916936: am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef:...Paul Lawrence2014-02-270-0/+0
| | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ \ am 8b916936: am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a:...Paul Lawrence2014-02-270-0/+0
| | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ \ \ am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b:...Paul Lawrence2014-02-270-0/+0
| | | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | * \ \ \ \ \ \ \ am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b:...Paul Lawrence2014-02-271-1/+24
| | | | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | * \ \ \ \ \ \ \ am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c:...Paul Lawrence2014-02-271-1/+24
| | | | | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | | * \ \ \ \ \ \ \ am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent auth...Paul Lawrence2014-02-271-1/+24
| | | | | | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ \ \ am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators fr...Paul Lawrence2014-02-271-1/+24
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | | | | * \ \ \ \ \ \ \ am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Sett...Paul Lawrence2014-02-271-1/+24
| | | | | | | | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | * \ \ \ \ \ \ \ am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to laun...Paul Lawrence2014-02-271-1/+24
| | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \