Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | resolved conflicts for merge of 1e8a87dd to master | Guang Zhu | 2014-05-07 | 2 | -0/+12 |
|\ | |||||
| * | am f31d73c9: Merge "send accessibility events on view property invalidation" ... | Guang Zhu | 2014-05-07 | 2 | -0/+12 |
| |\ | |||||
| | * | Merge "send accessibility events on view property invalidation" into klp-modu... | Guang Zhu | 2014-05-07 | 2 | -0/+12 |
| | |\ | |||||
| | | * | send accessibility events on view property invalidation | Guang Zhu | 2014-05-06 | 2 | -0/+12 |
* | | | | Merge "Add attributes and flags for DocCentric." | Craig Mautner | 2014-05-07 | 5 | -15/+116 |
|\ \ \ \ | |||||
| * | | | | Add attributes and flags for DocCentric. | Craig Mautner | 2014-05-07 | 5 | -15/+116 |
* | | | | | Add enableSystemApp methods to DevicePolicyManager | Adam Connors | 2014-05-07 | 2 | -0/+44 |
* | | | | | Merge "Only show IME in navigation bar when it should" | Jason Monk | 2014-05-07 | 2 | -2/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Only show IME in navigation bar when it should | Jason Monk | 2014-05-07 | 2 | -2/+4 |
* | | | | | | Add new EDU user restrictions. | Julia Reynolds | 2014-05-07 | 1 | -1/+90 |
* | | | | | | am bfbddcad: am 4f295fe8: Merge "Clean up WindowInsets API for release" into ... | Adam Powell | 2014-05-07 | 2 | -9/+49 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | am 4f295fe8: Merge "Clean up WindowInsets API for release" into klp-modular-dev | Adam Powell | 2014-05-07 | 2 | -9/+49 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Clean up WindowInsets API for release | Adam Powell | 2014-05-06 | 2 | -9/+49 |
| | | |_|/ | | |/| | | |||||
| * | | | | am 17c5e990: Merge "DO NOT MERGE Hide banner manifest attribute." into klp-mo... | Tim Kilbourn | 2014-05-06 | 2 | -2/+12 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge "DO NOT MERGE Hide banner manifest attribute." into klp-modular-dev | Tim Kilbourn | 2014-05-06 | 2 | -2/+12 |
| | |\ \ \ | |||||
| | | * | | | DO NOT MERGE Hide banner manifest attribute. | Tim Kilbourn | 2014-05-06 | 2 | -2/+12 |
| * | | | | | am 84aaf124: Merge "Plumb display state and interactive information to Batter... | Jeff Brown | 2014-05-06 | 3 | -77/+102 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge "Plumb display state and interactive information to BatteryStats. (DO N... | Jeff Brown | 2014-05-06 | 3 | -77/+102 |
| | |\ \ \ \ | |||||
| | | * | | | | Plumb display state and interactive information to BatteryStats. (DO NOT MERGE) | Jeff Brown | 2014-05-06 | 3 | -77/+102 |
* | | | | | | | Revert "Add attributes and flags for DocCentric." | Ben Murdoch | 2014-05-07 | 5 | -116/+15 |
* | | | | | | | Add attributes and flags for DocCentric. | Craig Mautner | 2014-05-06 | 5 | -15/+116 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Merge "Add transport param to Connect APIs" | Matthew Xie | 2014-05-07 | 5 | -9/+75 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add transport param to Connect APIs | Ganesh Ganapathi Batta | 2014-05-06 | 5 | -9/+75 |
* | | | | | | | Merge changes I0c808d51,I4ecf0ede | Matthew Xie | 2014-05-07 | 3 | -5/+116 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Tear down PAN if we can't successfully complete a DHCP request | Sharvil Nanavati | 2014-05-06 | 1 | -0/+8 |
| * | | | | | | Add parse method to parse UUID from bytes for 16 bit, 32 bit and 128 bit | Wei Wang | 2014-05-06 | 2 | -5/+108 |
* | | | | | | | Merge "Make sure BluetoothSocket#connect throws on error." | Sharvil Nanavati | 2014-05-07 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Make sure BluetoothSocket#connect throws on error. | Sharvil Nanavati | 2014-05-06 | 1 | -0/+1 |
* | | | | | | | Public WebView permission API | Tao Bai | 2014-05-06 | 3 | -15/+10 |
* | | | | | | | First pass at adding FingerprintManagerService | Jim Miller | 2014-05-07 | 11 | -0/+729 |
* | | | | | | | Merge "Fix crash due to texture view callback threading invariants." | Jeff Brown | 2014-05-07 | 2 | -21/+13 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix crash due to texture view callback threading invariants. | Jeff Brown | 2014-05-06 | 2 | -21/+13 |
* | | | | | | | | Merge "Add AudioFormat.ENCODING_PCM_FLOAT" | Glenn Kasten | 2014-05-07 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add AudioFormat.ENCODING_PCM_FLOAT | Glenn Kasten | 2014-05-06 | 1 | -0/+3 |
* | | | | | | | | | Doc fix in TypeEvaluator method docs | Chet Haase | 2014-05-06 | 1 | -1/+1 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge "Add AudioFormat.getBytesPerSample and use it" | Glenn Kasten | 2014-05-06 | 2 | -14/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add AudioFormat.getBytesPerSample and use it | Glenn Kasten | 2014-05-06 | 2 | -14/+2 |
* | | | | | | | | | Camera2: Add missing capture result tags | Zhijun He | 2014-05-06 | 1 | -0/+315 |
* | | | | | | | | | Merge "Enable changing display configuration" | Dan Stoza | 2014-05-06 | 2 | -22/+69 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Enable changing display configuration | Dan Stoza | 2014-05-06 | 2 | -22/+69 |
* | | | | | | | | | Merge "Plumb display state and interactive information to BatteryStats." | Jeff Brown | 2014-05-06 | 3 | -87/+119 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Plumb display state and interactive information to BatteryStats. | Jeff Brown | 2014-05-06 | 3 | -87/+119 |
* | | | | | | | | | | am c41fa708: am a0516e7a: Merge "onWindowDismissed API cleanup" into klp-modu... | Adam Powell | 2014-05-06 | 4 | -6/+25 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | am a0516e7a: Merge "onWindowDismissed API cleanup" into klp-modular-dev | Adam Powell | 2014-05-06 | 4 | -6/+25 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Merge "onWindowDismissed API cleanup" into klp-modular-dev | Adam Powell | 2014-05-06 | 4 | -6/+25 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | |||||
| | | * | | | | | | | onWindowDismissed API cleanup | Adam Powell | 2014-05-05 | 4 | -6/+25 |
| * | | | | | | | | | am 0f3a98f5: DO NOT MERGE Hide isGame manifest attribute. | Tim Kilbourn | 2014-05-06 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | DO NOT MERGE Hide isGame manifest attribute. | Tim Kilbourn | 2014-05-06 | 2 | -2/+2 |
| | * | | | | | | | | Merge "Import translations. DO NOT MERGE" into klp-modular-dev | Baligh Uddin | 2014-05-06 | 4 | -13/+13 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2014-05-05 | 4 | -13/+13 |