Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Flags to select storage volume for app installs." into mnc-dev | Jeff Sharkey | 2015-06-10 | 3 | -0/+18 |
|\ | |||||
| * | Flags to select storage volume for app installs. | Jeff Sharkey | 2015-06-09 | 3 | -0/+18 |
* | | Merge "Copy lockTaskLaunchMode from target activity to its alias." into mnc-dev | Yao Chen | 2015-06-10 | 1 | -0/+1 |
|\ \ | |||||
| * | | Copy lockTaskLaunchMode from target activity to its alias. | Yao Chen | 2015-06-09 | 1 | -0/+1 |
* | | | Merge "Expand scrim all the way to the right" into mnc-dev | Adrian Roos | 2015-06-10 | 4 | -7/+68 |
|\ \ \ | |||||
| * | | | Expand scrim all the way to the right | Adrian Roos | 2015-06-10 | 4 | -7/+68 |
* | | | | Merge "Use who when requesting permissions" into mnc-dev | Svetoslav | 2015-06-10 | 5 | -30/+43 |
|\ \ \ \ | |||||
| * | | | | Use who when requesting permissions | Svetoslav | 2015-06-09 | 5 | -30/+43 |
* | | | | | Merge "Add content description to keyguard user avatar" into mnc-dev | Adrian Roos | 2015-06-10 | 4 | -30/+74 |
|\ \ \ \ \ | |||||
| * | | | | | Add content description to keyguard user avatar | Adrian Roos | 2015-06-09 | 4 | -30/+74 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge "Fix NPE." into mnc-dev | Dianne Hackborn | 2015-06-10 | 1 | -2/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Fix NPE. | Dianne Hackborn | 2015-06-09 | 1 | -2/+4 |
* | | | | | | Merge "media: hook up OnFrameRenderedListener events to framework events" int... | Lajos Molnar | 2015-06-10 | 3 | -36/+76 |
|\ \ \ \ \ \ | |||||
| * | | | | | | media: hook up OnFrameRenderedListener events to framework events | Lajos Molnar | 2015-06-08 | 3 | -36/+76 |
* | | | | | | | Merge "ImageWallpaper: Atomically fetch display info" into mnc-dev | Adrian Roos | 2015-06-10 | 1 | -20/+18 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | ImageWallpaper: Atomically fetch display info | Adrian Roos | 2015-06-09 | 1 | -20/+18 |
* | | | | | | | Merge "Change wtf errors from ASSERT to ERROR." into mnc-dev | Christopher Ferris | 2015-06-10 | 1 | -1/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Change wtf errors from ASSERT to ERROR. | Christopher Ferris | 2015-06-09 | 1 | -1/+4 |
* | | | | | | | | Merge "Dont create a dummy animation for a transferred animation" into mnc-dev | Stefan Kuhne | 2015-06-10 | 2 | -17/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Dont create a dummy animation for a transferred animation | Stefan Kuhne | 2015-06-09 | 2 | -17/+9 |
* | | | | | | | | | Merge "Do not create profile if FEATURE_MANAGED_USERS is not available" into ... | Fyodor Kupolov | 2015-06-10 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | Do not create profile if FEATURE_MANAGED_USERS is not available | Fyodor Kupolov | 2015-06-09 | 1 | -0/+4 |
* | | | | | | | | | Merge "Fix issue #21621920: VI: need mechanism to get current request" into m... | Dianne Hackborn | 2015-06-09 | 13 | -40/+205 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix issue #21621920: VI: need mechanism to get current request | Dianne Hackborn | 2015-06-09 | 13 | -40/+205 |
* | | | | | | | | | | Merge "initial revision of NetworkDiagnostics" into mnc-dev | Erik Kline | 2015-06-09 | 2 | -0/+539 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | initial revision of NetworkDiagnostics | Erik Kline | 2015-06-09 | 2 | -0/+539 |
* | | | | | | | | | | | Merge "Switch over to updated VPN warning strings" into mnc-dev | Robin Lee | 2015-06-09 | 5 | -48/+133 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Switch over to updated VPN warning strings | Robin Lee | 2015-06-09 | 5 | -48/+133 |
* | | | | | | | | | | | | am 6974f22d: am 47e53319: Revert "Recompute focus stack if cleared while star... | Filip Gruszczynski | 2015-06-09 | 1 | -14/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | am 47e53319: Revert "Recompute focus stack if cleared while starting an activ... | Filip Gruszczynski | 2015-06-09 | 1 | -14/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Revert "Recompute focus stack if cleared while starting an activity." | Filip Gruszczynski | 2015-06-09 | 1 | -14/+7 |
* | | | | | | | | | | | | | | am 64b586e1: am 0b3d573e: Recompute focus stack if cleared while starting an ... | Wale Ogunwale | 2015-06-09 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | am 0b3d573e: Recompute focus stack if cleared while starting an activity. | Wale Ogunwale | 2015-06-09 | 1 | -7/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | Recompute focus stack if cleared while starting an activity. | Wale Ogunwale | 2015-06-09 | 1 | -7/+14 |
* | | | | | | | | | | | | | | am 33677f0c: am d8b632fb: Merge "docs: Fix WatchFace guide to no longer refer... | Luan Nguyen | 2015-06-09 | 1 | -87/+122 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | am d8b632fb: Merge "docs: Fix WatchFace guide to no longer reference deprecat... | Luan Nguyen | 2015-06-09 | 1 | -87/+122 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge "docs: Fix WatchFace guide to no longer reference deprecated Time.java ... | Luan Nguyen | 2015-06-09 | 1 | -87/+122 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | docs: Fix WatchFace guide to no longer reference deprecated Time.java | Luan Nguyen | 2015-06-05 | 1 | -87/+122 |
* | | | | | | | | | | | | | | | | Merge "Fixed issue with using wrong display id when creating context for disp... | Wale Ogunwale | 2015-06-09 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | Fixed issue with using wrong display id when creating context for displays | Wale Ogunwale | 2015-06-09 | 1 | -1/+2 |
* | | | | | | | | | | | | | | | | | Merge "Upload bitmaps in SkShader* safely" into mnc-dev | John Reck | 2015-06-09 | 3 | -16/+23 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | Upload bitmaps in SkShader* safely | John Reck | 2015-06-09 | 3 | -16/+23 |
* | | | | | | | | | | | | | | | | | | Merge "Add documentation for possible AndroidKeyStore exceptions to authentic... | Jim Miller | 2015-06-09 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | Add documentation for possible AndroidKeyStore exceptions to authenticate() call | Jim Miller | 2015-06-09 | 1 | -0/+5 |
* | | | | | | | | | | | | | | | | | | | Merge "Dont ignore layer paint alpha in software path" into mnc-dev | Chris Craik | 2015-06-09 | 1 | -9/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | Dont ignore layer paint alpha in software path | Chris Craik | 2015-06-09 | 1 | -9/+9 |
* | | | | | | | | | | | | | | | | | | | | Merge "MIDI docs: use getPorts()" into mnc-dev | Phil Burk | 2015-06-09 | 1 | -22/+41 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | MIDI docs: use getPorts() | Phil Burk | 2015-06-03 | 1 | -22/+41 |
* | | | | | | | | | | | | | | | | | | | | | Merge "Remove use of STATE_AUDIO_ONLY in a comparison." into mnc-dev | Tyler Gunn | 2015-06-09 | 2 | -2/+27 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | Remove use of STATE_AUDIO_ONLY in a comparison. | Tyler Gunn | 2015-06-09 | 2 | -2/+27 |