summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "add ranking information to the dumpsys info"Chris Wren2014-05-211-0/+2
|\
| * add ranking information to the dumpsys infoChris Wren2014-05-201-0/+2
* | am c2871696: am 6099fd21: Merge "Fix build." into klp-modular-devJeff Brown2014-05-211-1/+1
|\ \
| * \ am 6099fd21: Merge "Fix build." into klp-modular-devJeff Brown2014-05-211-1/+1
| |\ \
| | * \ Merge "Fix build." into klp-modular-devJeff Brown2014-05-211-1/+1
| | |\ \
| | | * | Fix build.Jeff Brown2014-05-201-1/+1
* | | | | am 77669abb: am 9beccf9f: Merge "Defer display ready until brightness ramp co...Jeff Brown2014-05-212-0/+35
|\ \ \ \ \ | |/ / / /
| * | | | am 9beccf9f: Merge "Defer display ready until brightness ramp completes." int...Jeff Brown2014-05-212-0/+35
| |\ \ \ \ | | |/ / /
| | * | | Merge "Defer display ready until brightness ramp completes." into klp-modular...Jeff Brown2014-05-212-0/+35
| | |\ \ \ | | | |/ /
| | | * | Defer display ready until brightness ramp completes.Jeff Brown2014-05-202-0/+35
* | | | | resolved conflicts for merge of fcc4fed3 to masterNarayan Kamath2014-05-217-16/+80
|\ \ \ \ \ | |/ / / /
| * | | | am 6fb904bf: Merge "Make power button behavior configurable." into klp-modula...Jeff Brown2014-05-217-16/+80
| |\ \ \ \ | | |/ / /
| | * | | Merge "Make power button behavior configurable." into klp-modular-devJeff Brown2014-05-217-16/+80
| | |\ \ \ | | | |/ /
| | | * | Make power button behavior configurable.Jeff Brown2014-05-207-16/+80
* | | | | Merge "Update comment of ACTION_PROFILE_PROVISIONING_COMPLETE."Sander Alewijnse2014-05-211-5/+4
|\ \ \ \ \
| * | | | | Update comment of ACTION_PROFILE_PROVISIONING_COMPLETE.Sander Alewijnse2014-05-201-5/+4
* | | | | | Merge "DPM: Disallow some DeviceAdmin policies for ProfileOwners"Robin Lee2014-05-211-0/+6
|\ \ \ \ \ \
| * | | | | | DPM: Disallow some DeviceAdmin policies for ProfileOwnersRobin Lee2014-05-211-0/+6
* | | | | | | Merge "Disallow adb sideloading if UserManager flag is set for user."Sander Alewijnse2014-05-211-2/+15
|\ \ \ \ \ \ \
| * | | | | | | Disallow adb sideloading if UserManager flag is set for user.Sander Alewijnse2014-05-211-2/+15
| | |/ / / / / | |/| | | | |
* | | | | | | am 1d265716: am e77a77d0: am ec71fed0: Merge "Improve ABI handling for shared...Brian Carlstrom2014-05-210-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | am e77a77d0: am ec71fed0: Merge "Improve ABI handling for shared user ids."Brian Carlstrom2014-05-211-26/+71
| |\ \ \ \ \ \
| | * \ \ \ \ \ am ec71fed0: Merge "Improve ABI handling for shared user ids."Brian Carlstrom2014-05-211-26/+71
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge "Improve ABI handling for shared user ids."Brian Carlstrom2014-05-211-26/+71
| | | |\ \ \ \ \ \
| | | | * | | | | | Improve ABI handling for shared user ids.Narayan Kamath2014-05-201-26/+71
* | | | | | | | | | Merge "Add several actions for ARC (Audio Return Channel)"Jungshik Jang2014-05-218-17/+516
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add several actions for ARC (Audio Return Channel)Jungshik Jang2014-05-218-17/+516
* | | | | | | | | | | Fix NullPointerException on init of HdmiMhlController.Jungshik Jang2014-05-211-0/+1
* | | | | | | | | | | Merge "Improve ABI handling for shared user ids."Brian Carlstrom2014-05-211-26/+71
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Improve ABI handling for shared user ids.Narayan Kamath2014-05-201-26/+71
* | | | | | | | | | | | Make Wifi WPS API available on application layerVinit Deshpande2014-05-203-14/+31
|/ / / / / / / / / / /
* | | | | | | | | | | Merge "Validate RenderScript context creation flags"Jason Sams2014-05-212-5/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Validate RenderScript context creation flagsJason Sams2014-05-202-5/+9
* | | | | | | | | | | | Merge "Hotspot 2.0 framework - add implementation"Yuhao Zheng2014-05-2121-504/+2601
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Hotspot 2.0 framework - add implementationRoger Chang2014-05-2021-504/+2601
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Add scan response as an advertising parameter(1/2).Wei Wang2014-05-204-8/+24
* | | | | | | | | | | | am 08a8c2ca: am ef6aae62: Merge "Fixes to WearableActionExtensions" into klp-...Griff Hazen2014-05-213-33/+37
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | am ef6aae62: Merge "Fixes to WearableActionExtensions" into klp-modular-devGriff Hazen2014-05-213-33/+37
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge "Fixes to WearableActionExtensions" into klp-modular-devGriff Hazen2014-05-213-33/+37
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fixes to WearableActionExtensionsGriff Hazen2014-05-203-33/+37
* | | | | | | | | | | | | am ccf51bef: am 2d9b513d: Merge "I\'m feeling the good vibrations." into klp-...Jeff Brown2014-05-211-7/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 2d9b513d: Merge "I\'m feeling the good vibrations." into klp-modular-devJeff Brown2014-05-211-7/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge "I'm feeling the good vibrations." into klp-modular-devJeff Brown2014-05-211-7/+24
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | |
| | | * | | | | | | | | | I'm feeling the good vibrations.Jeff Brown2014-05-201-7/+24
* | | | | | | | | | | | | am 8f120dd6: am 0702786d: Merge "Allow display timeouts to be set in config.x...Jeff Brown2014-05-213-16/+74
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 0702786d: Merge "Allow display timeouts to be set in config.xml." into klp...Jeff Brown2014-05-213-16/+74
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge "Allow display timeouts to be set in config.xml." into klp-modular-devJeff Brown2014-05-213-16/+74
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | Allow display timeouts to be set in config.xml.Jeff Brown2014-05-203-16/+74
* | | | | | | | | | | | | am 3dc330af: am f7963fab: am c1bb79d9: am bb0b8449: Remove monetization image...Dirk Dougherty2014-05-211-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | / / / / / / / / | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | am f7963fab: am c1bb79d9: am bb0b8449: Remove monetization image in edu guide...Dirk Dougherty2014-05-211-4/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /