summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Flags to select storage volume for app installs." into mnc-devJeff Sharkey2015-06-103-0/+18
|\
| * Flags to select storage volume for app installs.Jeff Sharkey2015-06-093-0/+18
* | Merge "Copy lockTaskLaunchMode from target activity to its alias." into mnc-devYao Chen2015-06-101-0/+1
|\ \
| * | Copy lockTaskLaunchMode from target activity to its alias.Yao Chen2015-06-091-0/+1
* | | Merge "Expand scrim all the way to the right" into mnc-devAdrian Roos2015-06-104-7/+68
|\ \ \
| * | | Expand scrim all the way to the rightAdrian Roos2015-06-104-7/+68
* | | | Merge "Use who when requesting permissions" into mnc-devSvetoslav2015-06-105-30/+43
|\ \ \ \
| * | | | Use who when requesting permissionsSvetoslav2015-06-095-30/+43
* | | | | Merge "Add content description to keyguard user avatar" into mnc-devAdrian Roos2015-06-104-30/+74
|\ \ \ \ \
| * | | | | Add content description to keyguard user avatarAdrian Roos2015-06-094-30/+74
| | |/ / / | |/| | |
* | | | | Merge "Fix NPE." into mnc-devDianne Hackborn2015-06-101-2/+4
|\ \ \ \ \
| * | | | | Fix NPE.Dianne Hackborn2015-06-091-2/+4
* | | | | | Merge "media: hook up OnFrameRenderedListener events to framework events" int...Lajos Molnar2015-06-103-36/+76
|\ \ \ \ \ \
| * | | | | | media: hook up OnFrameRenderedListener events to framework eventsLajos Molnar2015-06-083-36/+76
* | | | | | | Merge "ImageWallpaper: Atomically fetch display info" into mnc-devAdrian Roos2015-06-101-20/+18
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | ImageWallpaper: Atomically fetch display infoAdrian Roos2015-06-091-20/+18
* | | | | | | Merge "Change wtf errors from ASSERT to ERROR." into mnc-devChristopher Ferris2015-06-101-1/+4
|\ \ \ \ \ \ \
| * | | | | | | Change wtf errors from ASSERT to ERROR.Christopher Ferris2015-06-091-1/+4
* | | | | | | | Merge "Dont create a dummy animation for a transferred animation" into mnc-devStefan Kuhne2015-06-102-17/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Dont create a dummy animation for a transferred animationStefan Kuhne2015-06-092-17/+9
* | | | | | | | | Merge "Do not create profile if FEATURE_MANAGED_USERS is not available" into ...Fyodor Kupolov2015-06-101-0/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Do not create profile if FEATURE_MANAGED_USERS is not availableFyodor Kupolov2015-06-091-0/+4
* | | | | | | | | Merge "Fix issue #21621920: VI: need mechanism to get current request" into m...Dianne Hackborn2015-06-0913-40/+205
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix issue #21621920: VI: need mechanism to get current requestDianne Hackborn2015-06-0913-40/+205
* | | | | | | | | | Merge "initial revision of NetworkDiagnostics" into mnc-devErik Kline2015-06-092-0/+539
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | initial revision of NetworkDiagnosticsErik Kline2015-06-092-0/+539
* | | | | | | | | | | Merge "Switch over to updated VPN warning strings" into mnc-devRobin Lee2015-06-095-48/+133
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Switch over to updated VPN warning stringsRobin Lee2015-06-095-48/+133
* | | | | | | | | | | | am 6974f22d: am 47e53319: Revert "Recompute focus stack if cleared while star...Filip Gruszczynski2015-06-091-14/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am 47e53319: Revert "Recompute focus stack if cleared while starting an activ...Filip Gruszczynski2015-06-091-14/+7
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Revert "Recompute focus stack if cleared while starting an activity."Filip Gruszczynski2015-06-091-14/+7
* | | | | | | | | | | | | | am 64b586e1: am 0b3d573e: Recompute focus stack if cleared while starting an ...Wale Ogunwale2015-06-090-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am 0b3d573e: Recompute focus stack if cleared while starting an activity.Wale Ogunwale2015-06-091-7/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Recompute focus stack if cleared while starting an activity.Wale Ogunwale2015-06-091-7/+14
* | | | | | | | | | | | | | am 33677f0c: am d8b632fb: Merge "docs: Fix WatchFace guide to no longer refer...Luan Nguyen2015-06-091-87/+122
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am d8b632fb: Merge "docs: Fix WatchFace guide to no longer reference deprecat...Luan Nguyen2015-06-091-87/+122
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge "docs: Fix WatchFace guide to no longer reference deprecated Time.java ...Luan Nguyen2015-06-091-87/+122
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | docs: Fix WatchFace guide to no longer reference deprecated Time.javaLuan Nguyen2015-06-051-87/+122
* | | | | | | | | | | | | | | | Merge "Fixed issue with using wrong display id when creating context for disp...Wale Ogunwale2015-06-091-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fixed issue with using wrong display id when creating context for displaysWale Ogunwale2015-06-091-1/+2
* | | | | | | | | | | | | | | | | Merge "Upload bitmaps in SkShader* safely" into mnc-devJohn Reck2015-06-093-16/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Upload bitmaps in SkShader* safelyJohn Reck2015-06-093-16/+23
* | | | | | | | | | | | | | | | | | Merge "Add documentation for possible AndroidKeyStore exceptions to authentic...Jim Miller2015-06-091-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Add documentation for possible AndroidKeyStore exceptions to authenticate() callJim Miller2015-06-091-0/+5
* | | | | | | | | | | | | | | | | | | Merge "Dont ignore layer paint alpha in software path" into mnc-devChris Craik2015-06-091-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Dont ignore layer paint alpha in software pathChris Craik2015-06-091-9/+9
* | | | | | | | | | | | | | | | | | | | Merge "MIDI docs: use getPorts()" into mnc-devPhil Burk2015-06-091-22/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | MIDI docs: use getPorts()Phil Burk2015-06-031-22/+41
* | | | | | | | | | | | | | | | | | | | | Merge "Remove use of STATE_AUDIO_ONLY in a comparison." into mnc-devTyler Gunn2015-06-092-2/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Remove use of STATE_AUDIO_ONLY in a comparison.Tyler Gunn2015-06-092-2/+27