summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | Check DeviceOwner exists before using packageNameRobin Lee2014-02-201-3/+2
| | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | am c72f5c2d: am ec5c3b90: am c2c0a61c: Add copyright notice to files missing ...Craig Mautner2014-02-216-4/+92
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | am ec5c3b90: am c2c0a61c: Add copyright notice to files missing them.Craig Mautner2014-02-216-4/+92
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | am c2c0a61c: Add copyright notice to files missing them.Craig Mautner2014-02-216-4/+92
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Add copyright notice to files missing them.Craig Mautner2014-02-206-4/+92
| | | | |_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |
* | | | | | | | | | | | | | am a1aeac80: am 25c55ca9: am 911b2ce3: am 4a642ee5: Merge "Remove unused JNIT...Narayan Kamath2014-02-214-170/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am 25c55ca9: am 911b2ce3: am 4a642ee5: Merge "Remove unused JNITest class"Narayan Kamath2014-02-214-170/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | am 911b2ce3: am 4a642ee5: Merge "Remove unused JNITest class"Narayan Kamath2014-02-214-170/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | am 4a642ee5: Merge "Remove unused JNITest class"Narayan Kamath2014-02-214-170/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Merge "Remove unused JNITest class"Narayan Kamath2014-02-214-170/+0
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | Remove unused JNITest classAshok Bhat2014-02-214-170/+0
| | | | | | |_|_|_|_|_|_|_|/ | | | | | |/| | | | | | | |
* | | | | | | | | | | | | | am 61910447: am 7942397b: am 19256340: am 22c66639: Merge "Fixes for 64bit in...Narayan Kamath2014-02-212-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am 7942397b: am 19256340: am 22c66639: Merge "Fixes for 64bit in libhwui"Narayan Kamath2014-02-212-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | am 19256340: am 22c66639: Merge "Fixes for 64bit in libhwui"Narayan Kamath2014-02-212-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | am 22c66639: Merge "Fixes for 64bit in libhwui"Narayan Kamath2014-02-212-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / /
| | | | * | | | | | | | | | Merge "Fixes for 64bit in libhwui"Narayan Kamath2014-02-212-2/+2
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | Fixes for 64bit in libhwuiKévin PETIT2014-02-212-2/+2
* | | | | | | | | | | | | | Merge "AArch64: Make AssetAtlasService 64-bit compatible"Narayan Kamath2014-02-218-58/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | AArch64: Make AssetAtlasService 64-bit compatibleAshok Bhat2014-02-218-58/+61
* | | | | | | | | | | | | | | Merge "Reapply "Refactor setting an SkPaint onto a hwui Layer.""Derek Sollenberger2014-02-217-24/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Reapply "Refactor setting an SkPaint onto a hwui Layer."Derek Sollenberger2014-02-207-24/+15
* | | | | | | | | | | | | | | | Merge "Make LruCache.resize(int) public"Narayan Kamath2014-02-212-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Make LruCache.resize(int) publicNarayan Kamath2014-02-202-2/+2
| | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | am 6222a8ef: am 1648f042: am fd8a8ccb: Merge "Set the new SurfaceControl opaq...Craig Mautner2014-02-213-11/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | am 1648f042: am fd8a8ccb: Merge "Set the new SurfaceControl opaque flag." int...Craig Mautner2014-02-203-11/+54
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | am fd8a8ccb: Merge "Set the new SurfaceControl opaque flag." into klp-modular...Craig Mautner2014-02-203-11/+54
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Merge "Set the new SurfaceControl opaque flag." into klp-modular-devCraig Mautner2014-02-203-11/+54
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | Set the new SurfaceControl opaque flag.Craig Mautner2014-02-183-11/+54
* | | | | | | | | | | | | | | | am 56dbf7b0: am 3519530f: am 267b37ce: Merge "Resize DimLayer explicitly on r...Craig Mautner2014-02-211-31/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | am 3519530f: am 267b37ce: Merge "Resize DimLayer explicitly on rotation." int...Craig Mautner2014-02-201-31/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | am 267b37ce: Merge "Resize DimLayer explicitly on rotation." into klp-modular...Craig Mautner2014-02-201-31/+45
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | Merge "Resize DimLayer explicitly on rotation." into klp-modular-devCraig Mautner2014-02-201-31/+45
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | Resize DimLayer explicitly on rotation.Craig Mautner2014-02-201-31/+45
| | | | |/ / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge "Unbreak manual brightness setting."Michael Wright2014-02-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Unbreak manual brightness setting.Michael Wright2014-02-201-1/+1
* | | | | | | | | | | | | | | | | Merge "resolved conflicts for merge of baaa080b to master"Jeff Brown2014-02-2132-277/+1376
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of baaa080b to masterJeff Brown2014-02-2032-277/+1376
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | / / / | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | am 90506a41: am 07e6d1b9: Merge "Add a new "doze mode" based on Dream compone...Jeff Brown2014-02-2031-287/+1377
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | am 07e6d1b9: Merge "Add a new "doze mode" based on Dream components." into kl...Jeff Brown2014-02-2031-287/+1377
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / | | | | |/| | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Merge "Add a new "doze mode" based on Dream components." into klp-modular-devJeff Brown2014-02-2031-287/+1377
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | Add a new "doze mode" based on Dream components.Jeff Brown2014-02-2031-287/+1377
* | | | | | | | | | | | | | | | | | Merge "Add ability to match intents based on the package name of the intent s...Ben Gruver2014-02-212-0/+74
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Add ability to match intents based on the package name of the intent senderBen Gruver2014-02-122-0/+74
* | | | | | | | | | | | | | | | | | | Merge "Add more MediaStore constants for playback intents"Matt Casey2014-02-213-0/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Add more MediaStore constants for playback intentsMatt Casey2014-02-203-0/+37
* | | | | | | | | | | | | | | | | | | Merge "Abort removing account if prohibited by policy"Amith Yamasani2014-02-211-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Abort removing account if prohibited by policyAmith Yamasani2014-02-201-0/+1
* | | | | | | | | | | | | | | | | | | | am 17b7705a: (-s ours) am fbb100c4: (-s ours) am ea17c636: (-s ours) am 4292c...Baligh Uddin2014-02-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | am fbb100c4: (-s ours) am ea17c636: (-s ours) am 4292ce5d: (-s ours) am 81026...Baligh Uddin2014-02-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | am ea17c636: (-s ours) am 4292ce5d: (-s ours) am 810267c3: (-s ours) am 28009...Baligh Uddin2014-02-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | |