summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 1e8a87dd to masterGuang Zhu2014-05-072-0/+12
|\
| * am f31d73c9: Merge "send accessibility events on view property invalidation" ...Guang Zhu2014-05-072-0/+12
| |\
| | * Merge "send accessibility events on view property invalidation" into klp-modu...Guang Zhu2014-05-072-0/+12
| | |\
| | | * send accessibility events on view property invalidationGuang Zhu2014-05-062-0/+12
* | | | Merge "Add attributes and flags for DocCentric."Craig Mautner2014-05-075-15/+116
|\ \ \ \
| * | | | Add attributes and flags for DocCentric.Craig Mautner2014-05-075-15/+116
* | | | | Add enableSystemApp methods to DevicePolicyManagerAdam Connors2014-05-072-0/+44
* | | | | Merge "Only show IME in navigation bar when it should"Jason Monk2014-05-072-2/+4
|\ \ \ \ \
| * | | | | Only show IME in navigation bar when it shouldJason Monk2014-05-072-2/+4
* | | | | | Add new EDU user restrictions.Julia Reynolds2014-05-071-1/+90
* | | | | | am bfbddcad: am 4f295fe8: Merge "Clean up WindowInsets API for release" into ...Adam Powell2014-05-072-9/+49
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | am 4f295fe8: Merge "Clean up WindowInsets API for release" into klp-modular-devAdam Powell2014-05-072-9/+49
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Clean up WindowInsets API for releaseAdam Powell2014-05-062-9/+49
| | | |_|/ | | |/| |
| * | | | am 17c5e990: Merge "DO NOT MERGE Hide banner manifest attribute." into klp-mo...Tim Kilbourn2014-05-062-2/+12
| |\ \ \ \ | | |/ / /
| | * | | Merge "DO NOT MERGE Hide banner manifest attribute." into klp-modular-devTim Kilbourn2014-05-062-2/+12
| | |\ \ \
| | | * | | DO NOT MERGE Hide banner manifest attribute.Tim Kilbourn2014-05-062-2/+12
| * | | | | am 84aaf124: Merge "Plumb display state and interactive information to Batter...Jeff Brown2014-05-063-77/+102
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Plumb display state and interactive information to BatteryStats. (DO N...Jeff Brown2014-05-063-77/+102
| | |\ \ \ \
| | | * | | | Plumb display state and interactive information to BatteryStats. (DO NOT MERGE)Jeff Brown2014-05-063-77/+102
* | | | | | | Revert "Add attributes and flags for DocCentric."Ben Murdoch2014-05-075-116/+15
* | | | | | | Add attributes and flags for DocCentric.Craig Mautner2014-05-065-15/+116
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge "Add transport param to Connect APIs"Matthew Xie2014-05-075-9/+75
|\ \ \ \ \ \
| * | | | | | Add transport param to Connect APIsGanesh Ganapathi Batta2014-05-065-9/+75
* | | | | | | Merge changes I0c808d51,I4ecf0edeMatthew Xie2014-05-073-5/+116
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Tear down PAN if we can't successfully complete a DHCP requestSharvil Nanavati2014-05-061-0/+8
| * | | | | | Add parse method to parse UUID from bytes for 16 bit, 32 bit and 128 bitWei Wang2014-05-062-5/+108
* | | | | | | Merge "Make sure BluetoothSocket#connect throws on error."Sharvil Nanavati2014-05-071-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Make sure BluetoothSocket#connect throws on error.Sharvil Nanavati2014-05-061-0/+1
* | | | | | | Public WebView permission APITao Bai2014-05-063-15/+10
* | | | | | | First pass at adding FingerprintManagerServiceJim Miller2014-05-0711-0/+729
* | | | | | | Merge "Fix crash due to texture view callback threading invariants."Jeff Brown2014-05-072-21/+13
|\ \ \ \ \ \ \
| * | | | | | | Fix crash due to texture view callback threading invariants.Jeff Brown2014-05-062-21/+13
* | | | | | | | Merge "Add AudioFormat.ENCODING_PCM_FLOAT"Glenn Kasten2014-05-071-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Add AudioFormat.ENCODING_PCM_FLOATGlenn Kasten2014-05-061-0/+3
* | | | | | | | | Doc fix in TypeEvaluator method docsChet Haase2014-05-061-1/+1
|/ / / / / / / /
* | | | | | | | Merge "Add AudioFormat.getBytesPerSample and use it"Glenn Kasten2014-05-062-14/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Add AudioFormat.getBytesPerSample and use itGlenn Kasten2014-05-062-14/+2
* | | | | | | | | Camera2: Add missing capture result tagsZhijun He2014-05-061-0/+315
* | | | | | | | | Merge "Enable changing display configuration"Dan Stoza2014-05-062-22/+69
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Enable changing display configurationDan Stoza2014-05-062-22/+69
* | | | | | | | | Merge "Plumb display state and interactive information to BatteryStats."Jeff Brown2014-05-063-87/+119
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Plumb display state and interactive information to BatteryStats.Jeff Brown2014-05-063-87/+119
* | | | | | | | | | am c41fa708: am a0516e7a: Merge "onWindowDismissed API cleanup" into klp-modu...Adam Powell2014-05-064-6/+25
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | am a0516e7a: Merge "onWindowDismissed API cleanup" into klp-modular-devAdam Powell2014-05-064-6/+25
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | * | | | | | | | Merge "onWindowDismissed API cleanup" into klp-modular-devAdam Powell2014-05-064-6/+25
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | | * | | | | | | onWindowDismissed API cleanupAdam Powell2014-05-054-6/+25
| * | | | | | | | | am 0f3a98f5: DO NOT MERGE Hide isGame manifest attribute.Tim Kilbourn2014-05-062-2/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | DO NOT MERGE Hide isGame manifest attribute.Tim Kilbourn2014-05-062-2/+2
| | * | | | | | | | Merge "Import translations. DO NOT MERGE" into klp-modular-devBaligh Uddin2014-05-064-13/+13
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-05-054-13/+13