Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "add ranking information to the dumpsys info" | Chris Wren | 2014-05-21 | 1 | -0/+2 |
|\ | |||||
| * | add ranking information to the dumpsys info | Chris Wren | 2014-05-20 | 1 | -0/+2 |
* | | am c2871696: am 6099fd21: Merge "Fix build." into klp-modular-dev | Jeff Brown | 2014-05-21 | 1 | -1/+1 |
|\ \ | |||||
| * \ | am 6099fd21: Merge "Fix build." into klp-modular-dev | Jeff Brown | 2014-05-21 | 1 | -1/+1 |
| |\ \ | |||||
| | * \ | Merge "Fix build." into klp-modular-dev | Jeff Brown | 2014-05-21 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * | | Fix build. | Jeff Brown | 2014-05-20 | 1 | -1/+1 |
* | | | | | am 77669abb: am 9beccf9f: Merge "Defer display ready until brightness ramp co... | Jeff Brown | 2014-05-21 | 2 | -0/+35 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am 9beccf9f: Merge "Defer display ready until brightness ramp completes." int... | Jeff Brown | 2014-05-21 | 2 | -0/+35 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge "Defer display ready until brightness ramp completes." into klp-modular... | Jeff Brown | 2014-05-21 | 2 | -0/+35 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Defer display ready until brightness ramp completes. | Jeff Brown | 2014-05-20 | 2 | -0/+35 |
* | | | | | resolved conflicts for merge of fcc4fed3 to master | Narayan Kamath | 2014-05-21 | 7 | -16/+80 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am 6fb904bf: Merge "Make power button behavior configurable." into klp-modula... | Jeff Brown | 2014-05-21 | 7 | -16/+80 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge "Make power button behavior configurable." into klp-modular-dev | Jeff Brown | 2014-05-21 | 7 | -16/+80 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Make power button behavior configurable. | Jeff Brown | 2014-05-20 | 7 | -16/+80 |
* | | | | | Merge "Update comment of ACTION_PROFILE_PROVISIONING_COMPLETE." | Sander Alewijnse | 2014-05-21 | 1 | -5/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Update comment of ACTION_PROFILE_PROVISIONING_COMPLETE. | Sander Alewijnse | 2014-05-20 | 1 | -5/+4 |
* | | | | | | Merge "DPM: Disallow some DeviceAdmin policies for ProfileOwners" | Robin Lee | 2014-05-21 | 1 | -0/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | DPM: Disallow some DeviceAdmin policies for ProfileOwners | Robin Lee | 2014-05-21 | 1 | -0/+6 |
* | | | | | | | Merge "Disallow adb sideloading if UserManager flag is set for user." | Sander Alewijnse | 2014-05-21 | 1 | -2/+15 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Disallow adb sideloading if UserManager flag is set for user. | Sander Alewijnse | 2014-05-21 | 1 | -2/+15 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | am 1d265716: am e77a77d0: am ec71fed0: Merge "Improve ABI handling for shared... | Brian Carlstrom | 2014-05-21 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | am e77a77d0: am ec71fed0: Merge "Improve ABI handling for shared user ids." | Brian Carlstrom | 2014-05-21 | 1 | -26/+71 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | am ec71fed0: Merge "Improve ABI handling for shared user ids." | Brian Carlstrom | 2014-05-21 | 1 | -26/+71 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge "Improve ABI handling for shared user ids." | Brian Carlstrom | 2014-05-21 | 1 | -26/+71 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | Improve ABI handling for shared user ids. | Narayan Kamath | 2014-05-20 | 1 | -26/+71 |
* | | | | | | | | | | Merge "Add several actions for ARC (Audio Return Channel)" | Jungshik Jang | 2014-05-21 | 8 | -17/+516 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add several actions for ARC (Audio Return Channel) | Jungshik Jang | 2014-05-21 | 8 | -17/+516 |
* | | | | | | | | | | | Fix NullPointerException on init of HdmiMhlController. | Jungshik Jang | 2014-05-21 | 1 | -0/+1 |
* | | | | | | | | | | | Merge "Improve ABI handling for shared user ids." | Brian Carlstrom | 2014-05-21 | 1 | -26/+71 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Improve ABI handling for shared user ids. | Narayan Kamath | 2014-05-20 | 1 | -26/+71 |
* | | | | | | | | | | | | Make Wifi WPS API available on application layer | Vinit Deshpande | 2014-05-20 | 3 | -14/+31 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge "Validate RenderScript context creation flags" | Jason Sams | 2014-05-21 | 2 | -5/+9 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Validate RenderScript context creation flags | Jason Sams | 2014-05-20 | 2 | -5/+9 |
* | | | | | | | | | | | | Merge "Hotspot 2.0 framework - add implementation" | Yuhao Zheng | 2014-05-21 | 21 | -504/+2601 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Hotspot 2.0 framework - add implementation | Roger Chang | 2014-05-20 | 21 | -504/+2601 |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Add scan response as an advertising parameter(1/2). | Wei Wang | 2014-05-20 | 4 | -8/+24 |
* | | | | | | | | | | | | am 08a8c2ca: am ef6aae62: Merge "Fixes to WearableActionExtensions" into klp-... | Griff Hazen | 2014-05-21 | 3 | -33/+37 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | am ef6aae62: Merge "Fixes to WearableActionExtensions" into klp-modular-dev | Griff Hazen | 2014-05-21 | 3 | -33/+37 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | Merge "Fixes to WearableActionExtensions" into klp-modular-dev | Griff Hazen | 2014-05-21 | 3 | -33/+37 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | Fixes to WearableActionExtensions | Griff Hazen | 2014-05-20 | 3 | -33/+37 |
* | | | | | | | | | | | | | am ccf51bef: am 2d9b513d: Merge "I\'m feeling the good vibrations." into klp-... | Jeff Brown | 2014-05-21 | 1 | -7/+24 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | am 2d9b513d: Merge "I\'m feeling the good vibrations." into klp-modular-dev | Jeff Brown | 2014-05-21 | 1 | -7/+24 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | Merge "I'm feeling the good vibrations." into klp-modular-dev | Jeff Brown | 2014-05-21 | 1 | -7/+24 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | | I'm feeling the good vibrations. | Jeff Brown | 2014-05-20 | 1 | -7/+24 |
* | | | | | | | | | | | | | am 8f120dd6: am 0702786d: Merge "Allow display timeouts to be set in config.x... | Jeff Brown | 2014-05-21 | 3 | -16/+74 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | am 0702786d: Merge "Allow display timeouts to be set in config.xml." into klp... | Jeff Brown | 2014-05-21 | 3 | -16/+74 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | Merge "Allow display timeouts to be set in config.xml." into klp-modular-dev | Jeff Brown | 2014-05-21 | 3 | -16/+74 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | |||||
| | | * | | | | | | | | | | Allow display timeouts to be set in config.xml. | Jeff Brown | 2014-05-20 | 3 | -16/+74 |
* | | | | | | | | | | | | | am 3dc330af: am f7963fab: am c1bb79d9: am bb0b8449: Remove monetization image... | Dirk Dougherty | 2014-05-21 | 1 | -4/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | / / / / / / / / | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | am f7963fab: am c1bb79d9: am bb0b8449: Remove monetization image in edu guide... | Dirk Dougherty | 2014-05-21 | 1 | -4/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / |