summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'goog/master-lockscreen-dev'Jorim Jaggi2014-04-11157-1511/+2482
|\
| * am fd7d3108: Merge "Implement USB Audio across Nexus Devices Fix issues with ...Paul McLean2014-04-113-83/+185
| |\ | |/ |/|
* | Merge "Implement USB Audio across Nexus Devices Fix issues with connecting no...Paul McLean2014-04-113-83/+185
|\ \
| * | Implement USB Audio across Nexus DevicesPaul McLean2014-04-113-83/+185
| | * am d1d7c491: Merge "Revert "Revert "Initial implementation of USB Audio outpu...Paul McLean2014-04-116-8/+531
| | |\ | |_|/ |/| |
* | | Merge "Revert "Revert "Initial implementation of USB Audio output."""Paul McLean2014-04-116-8/+531
|\ \ \ | |/ /
| * | Revert "Revert "Initial implementation of USB Audio output.""Paul McLean2014-04-096-8/+531
| | * Fix incoming phone calls on lockscreen.Jorim Jaggi2014-04-111-2/+2
| | * am c70f3db8: Merge "Simplify matrix calculations"John Reck2014-04-115-150/+86
| | |\ | |_|/ |/| |
* | | Merge "Simplify matrix calculations"John Reck2014-04-115-150/+86
|\ \ \
| * | | Simplify matrix calculationsJohn Reck2014-04-115-150/+86
| | | * am d951ab23: am 8ebd66c2: am cd4c1c71: Merge "Add stringType and requiredPerm...Aravind Akella2014-04-116-9/+272
| | | |\ | |_|_|/ |/| | |
* | | | am 8ebd66c2: am cd4c1c71: Merge "Add stringType and requiredPermissions to Se...Aravind Akella2014-04-116-9/+272
|\ \ \ \
| * \ \ \ am cd4c1c71: Merge "Add stringType and requiredPermissions to SensorManager.j...Aravind Akella2014-04-116-9/+272
| |\ \ \ \
| | * \ \ \ Merge "Add stringType and requiredPermissions to SensorManager.java, as well ...Aravind Akella2014-04-116-9/+272
| | |\ \ \ \
| | | * | | | Add stringType and requiredPermissions to SensorManager.java, as well as a pe...Aravind Akella2014-04-116-9/+272
| | | | | | * am 68b9d975: am 9e99cab7: am 970417c7: Added getLeanbackLaunchIntentForPackage()Jose Lima2014-04-114-10/+54
| | | | | | |\ | |_|_|_|_|_|/ |/| | | | | |
* | | | | | | am 9e99cab7: am 970417c7: Added getLeanbackLaunchIntentForPackage()Jose Lima2014-04-114-10/+54
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 970417c7: Added getLeanbackLaunchIntentForPackage()Jose Lima2014-04-114-11/+55
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Added getLeanbackLaunchIntentForPackage()Jose Lima2014-04-114-11/+55
| | | | | | * am ae3f7cca: Merge "Add app_name to keyguard package."John Spurlock2014-04-111-0/+2
| | | | | | |\ | |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge "Add app_name to keyguard package."John Spurlock2014-04-111-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Add app_name to keyguard package.John Spurlock2014-04-101-0/+2
| | | | | | | * am 6d8479d5: am 88a99645: am 97953b30: am 4f4892d0: Merge "Workaround 64 bit ...Narayan Kamath2014-04-111-1/+11
| | | | | | | |\ | |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | am 88a99645: am 97953b30: am 4f4892d0: Merge "Workaround 64 bit devices that ...Narayan Kamath2014-04-111-1/+11
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am 97953b30: am 4f4892d0: Merge "Workaround 64 bit devices that don\'t have z...Narayan Kamath2014-04-111-1/+11
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ am 4f4892d0: Merge "Workaround 64 bit devices that don\'t have zygotes yet."Narayan Kamath2014-04-111-1/+11
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge "Workaround 64 bit devices that don't have zygotes yet."Narayan Kamath2014-04-111-1/+11
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Workaround 64 bit devices that don't have zygotes yet.Narayan Kamath2014-04-111-1/+11
| | | |/ / / / / / /
| | | | | | | | | * am f5bcd887: Merge "Refactoring filter animation logic."Winson Chung2014-04-115-257/+163
| | | | | | | | | |\ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Merge "Refactoring filter animation logic."Winson Chung2014-04-115-257/+163
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Refactoring filter animation logic.Winson Chung2014-04-115-257/+163
| | | | | | | | | | * am 0f7ed1f4: Merge "Adding system support for a single accessibility focus."Svetoslav2014-04-118-91/+276
| | | | | | | | | | |\ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | Merge "Adding system support for a single accessibility focus."Svetoslav2014-04-118-91/+276
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Adding system support for a single accessibility focus.Svetoslav2014-04-118-91/+276
| | | | | | | | | | | * am 62499493: Merge "Add toString() for SearchIndexableData and SearchIndexabl...Fabrice Di Meglio2014-04-112-0/+53
| | | | | | | | | | | |\ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | Merge "Add toString() for SearchIndexableData and SearchIndexableResource"Fabrice Di Meglio2014-04-112-0/+53
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Add toString() for SearchIndexableData and SearchIndexableResourceFabrice Di Meglio2014-04-102-0/+53
| | | | | | | | | | | * Merge "Change scrim on lockscreen and transparency of cards a bit." into mast...Jorim Jaggi2014-04-113-3/+8
| | | | | | | | | | | |\
| | | | | | | | | | | | * Change scrim on lockscreen and transparency of cards a bit.Jorim Jaggi2014-04-113-3/+8
| | | | | | | | | | | * | am f873e785: am c2bd3687: am 70bba904: am b093e485: Merge "generateProjectThu...Elliott Hughes2014-04-111-3/+5
| | | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
* | | | | | | | | | | | | am c2bd3687: am 70bba904: am b093e485: Merge "generateProjectThumbnail can fa...Elliott Hughes2014-04-111-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | am 70bba904: am b093e485: Merge "generateProjectThumbnail can fail to close o...Elliott Hughes2014-04-111-3/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | am b093e485: Merge "generateProjectThumbnail can fail to close output stream"Elliott Hughes2014-04-111-3/+5
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge "generateProjectThumbnail can fail to close output stream"Elliott Hughes2014-04-111-3/+5
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | generateProjectThumbnail can fail to close output streamHenrik Baard2013-07-111-3/+5
| | | | | | | | | | | | * | am 1f2966ea: am 8e6992fb: am 1ea1857d: am 8cd319b8: Merge "Add additional lan...Elliott Hughes2014-04-111-1/+10
| | | | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | am 8e6992fb: am 1ea1857d: am 8cd319b8: Merge "Add additional languages to be ...Elliott Hughes2014-04-111-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am 1ea1857d: am 8cd319b8: Merge "Add additional languages to be accepted by t...Elliott Hughes2014-04-111-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | am 8cd319b8: Merge "Add additional languages to be accepted by the NumberPick...Elliott Hughes2014-04-111-1/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /