Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | Merge "Tabs -> spaces in frameworks/base." | John Spurlock | 2014-02-25 | 4 | -7/+7 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Tabs -> spaces in frameworks/base. | John Spurlock | 2014-02-25 | 4 | -7/+7 | |
* | | | | | | | | | | | am c407ace3: am d4c819c0: am dd9ce628: Merge "Clean up activities and display... | Craig Mautner | 2014-02-25 | 6 | -42/+96 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | / / / / / / | | |_|_|/ / / / / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | am dd9ce628: Merge "Clean up activities and displays when done" into klp-modu... | Craig Mautner | 2014-02-25 | 6 | -42/+96 | |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | ||||||
| | * | | | | | | | | Merge "Clean up activities and displays when done" into klp-modular-dev | Craig Mautner | 2014-02-25 | 6 | -42/+96 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | Clean up activities and displays when done | Craig Mautner | 2014-02-25 | 6 | -42/+96 | |
* | | | | | | | | | | | am f2d07694: am 6eff9949: am 0fc59cd9: am da2bbaf2: am 2c7b913e: am 5daec5b5:... | Mike Lockwood | 2014-02-25 | 1 | -6/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | am 0fc59cd9: am da2bbaf2: am 2c7b913e: am 5daec5b5: Merge "UsbDeviceManager: ... | Mike Lockwood | 2014-02-25 | 1 | -6/+26 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | am da2bbaf2: am 2c7b913e: am 5daec5b5: Merge "UsbDeviceManager: Fix race cond... | Mike Lockwood | 2014-02-25 | 1 | -6/+26 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ | am 2c7b913e: am 5daec5b5: Merge "UsbDeviceManager: Fix race condition enterin... | Mike Lockwood | 2014-02-25 | 1 | -6/+26 | |
| | | |\ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | UsbDeviceManager: Fix race condition entering USB accessory mode | Mike Lockwood | 2014-02-19 | 1 | -6/+26 | |
* | | | | | | | | | | | | | am 01d63a35: am ae8106ef: am 2326acb5: Merge "Fix typo that causes dreaming o... | Jeff Brown | 2014-02-25 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | am 2326acb5: Merge "Fix typo that causes dreaming on battery." into klp-modul... | Jeff Brown | 2014-02-25 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | Merge "Fix typo that causes dreaming on battery." into klp-modular-dev | Jeff Brown | 2014-02-25 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | Fix typo that causes dreaming on battery. | Jeff Brown | 2014-02-24 | 1 | -1/+1 | |
* | | | | | | | | | | | | | am cd9cd758: am c213b3a3: am f7f80d7b: Merge "Start the dream manager even if... | Jeff Brown | 2014-02-24 | 1 | -3/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | am f7f80d7b: Merge "Start the dream manager even if dreams are not supported.... | Jeff Brown | 2014-02-24 | 1 | -3/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | Merge "Start the dream manager even if dreams are not supported." into klp-mo... | Jeff Brown | 2014-02-24 | 1 | -3/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | ||||||
| | | * | | | | | | | | | | Start the dream manager even if dreams are not supported. | Jeff Brown | 2014-02-24 | 1 | -3/+2 | |
* | | | | | | | | | | | | | Merge "Improve how battery stats collects network stats." | Dianne Hackborn | 2014-02-24 | 1 | -2/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Improve how battery stats collects network stats. | Dianne Hackborn | 2014-02-24 | 1 | -2/+3 | |
* | | | | | | | | | | | | | | Remove unneeded new RIL command. | Jake Hamby | 2014-02-24 | 1 | -4/+2 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge "Only allow System apps to make VPN exempt routes" | Chad Brubaker | 2014-02-24 | 2 | -6/+84 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Only allow System apps to make VPN exempt routes | Chad Brubaker | 2014-02-21 | 2 | -6/+84 | |
* | | | | | | | | | | | | | | Merge "Add the calling package name to requestRouteToHost" | Chad Brubaker | 2014-02-24 | 1 | -4/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | / / / / / / | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Add the calling package name to requestRouteToHost | Chad Brubaker | 2014-02-19 | 1 | -4/+5 | |
* | | | | | | | | | | | | | Merge "Enables a profile owner or device owner to set and clear default inten... | Sander Alewijnse | 2014-02-24 | 5 | -0/+381 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Enables a profile owner or device owner to set and clear default intent handl... | Sander Alewijnse | 2014-02-21 | 5 | -0/+381 | |
* | | | | | | | | | | | | | am 3dc57b39: am c004c9a8: am ffda4648: Merge "Fixes for ActivityView on home ... | Craig Mautner | 2014-02-22 | 1 | -7/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | am ffda4648: Merge "Fixes for ActivityView on home activity" into klp-modular... | Craig Mautner | 2014-02-22 | 1 | -7/+18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Merge "Fixes for ActivityView on home activity" into klp-modular-dev | Craig Mautner | 2014-02-22 | 1 | -7/+18 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / | | | |/| | | | | | | | | | ||||||
| | | * | | | | | | | | | | Fixes for ActivityView on home activity | Craig Mautner | 2014-02-21 | 1 | -7/+18 | |
* | | | | | | | | | | | | | resolved conflicts for merge of d2794f5e to master | Craig Mautner | 2014-02-21 | 2 | -25/+27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | am f0f45452: Merge "Reset deferred task removal when app token added." into k... | Craig Mautner | 2014-02-22 | 2 | -26/+27 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | Merge "Reset deferred task removal when app token added." into klp-modular-dev | Craig Mautner | 2014-02-22 | 2 | -26/+27 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | Reset deferred task removal when app token added. | Craig Mautner | 2014-02-21 | 2 | -26/+27 | |
* | | | | | | | | | | | | | | am 5f652b9f: am 0cab896a: resolved conflicts for merge of 9e413bf4 to klp-mod... | Greg Hackmann | 2014-02-22 | 2 | -2/+96 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | resolved conflicts for merge of 9e413bf4 to klp-modular-dev-plus-aosp | Greg Hackmann | 2014-02-21 | 2 | -2/+96 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal | Greg Hackmann | 2014-02-21 | 1 | -7/+7 | |
| | * | | | | | | | | | | | | Move time setting code from SystemClock to AlarmManagerService | Greg Hackmann | 2014-02-21 | 2 | -2/+96 | |
* | | | | | | | | | | | | | | am 542b55d9: am c8661519: am 83930aa0: Merge "Fix broken IME when decrypting ... | Adam Lesinski | 2014-02-22 | 1 | -128/+121 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | am 83930aa0: Merge "Fix broken IME when decrypting storage" into klp-modular-dev | Adam Lesinski | 2014-02-21 | 1 | -128/+121 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Merge "Fix broken IME when decrypting storage" into klp-modular-dev | Adam Lesinski | 2014-02-21 | 1 | -128/+121 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | Fix broken IME when decrypting storage | Adam Lesinski | 2014-02-21 | 1 | -128/+121 | |
* | | | | | | | | | | | | | | Merge "add new accessibility action for EditText to set text content" | Guang Zhu | 2014-02-21 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | add new accessibility action for EditText to set text content | Guang Zhu | 2014-02-20 | 1 | -1/+2 | |
* | | | | | | | | | | | | | | | Merge "ConnectivityService: add support to set TCP initial rwnd" | JP Abgrall | 2014-02-21 | 1 | -0/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | ConnectivityService: add support to set TCP initial rwnd | JP Abgrall | 2014-02-21 | 1 | -0/+9 | |
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge "Check DeviceOwner exists before using packageName" | Robin Lee | 2014-02-21 | 1 | -3/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Check DeviceOwner exists before using packageName | Robin Lee | 2014-02-20 | 1 | -3/+2 | |
| |/ / / / / / / / / / / / / |