Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 3cab7fc1: Merge "Add proxy as another network." into klp-modular-dev | Hui Lu | 2014-01-31 | 1 | -0/+4 |
|\ | |||||
| * | Merge "Add proxy as another network." into klp-modular-dev | Hui Lu | 2014-01-30 | 1 | -0/+4 |
| |\ | |||||
| | * | Add proxy as another network. | Hui Lu | 2014-01-30 | 1 | -0/+4 |
| * | | am 39a789bf: am 7ae1726d: am aa9ba887: am 6e09eb4c: Merge "AArch64: Make grap... | Narayan Kamath | 2014-01-28 | 2 | -11/+11 |
| |\ \ | |||||
| | * \ | am 7ae1726d: am aa9ba887: am 6e09eb4c: Merge "AArch64: Make graphics classes ... | Narayan Kamath | 2014-01-28 | 2 | -11/+11 |
| | |\ \ | |||||
| | | * \ | am aa9ba887: am 6e09eb4c: Merge "AArch64: Make graphics classes 64-bit compat... | Narayan Kamath | 2014-01-28 | 2 | -11/+11 |
| | | |\ \ | |||||
| | | | * \ | Merge "AArch64: Make graphics classes 64-bit compatible" | Narayan Kamath | 2014-01-28 | 2 | -11/+11 |
| | | | |\ \ | |||||
| | | | | * | | AArch64: Make graphics classes 64-bit compatible | Ashok Bhat | 2014-01-28 | 2 | -11/+11 |
* | | | | | | | Merge "frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default" | Brian Carlstrom | 2014-01-31 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default | Brian Carlstrom | 2014-01-30 | 1 | -1/+1 |
* | | | | | | | | Formatting fix | Patrick Tjin | 2014-01-30 | 1 | -0/+1 |
|/ / / / / / / | |||||
* | | | | | | | Merge "Adapt to underlying changes in the PBKDF2 implementation" | Christopher Tate | 2014-01-29 | 1 | -84/+169 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Adapt to underlying changes in the PBKDF2 implementation | Christopher Tate | 2014-01-16 | 1 | -84/+169 |
* | | | | | | | | am af17925f: am 45b68ac3: am 09325627: am 245b58d6: am baf2c7a4: Merge "[Acti... | Craig Mautner | 2014-01-28 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | am 45b68ac3: am 09325627: am 245b58d6: am baf2c7a4: Merge "[ActivityManager]:... | Craig Mautner | 2014-01-28 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | am 09325627: am 245b58d6: am baf2c7a4: Merge "[ActivityManager]: Fix the acti... | Craig Mautner | 2014-01-28 | 1 | -0/+1 |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | |||||
| | | * | | | | | am 245b58d6: am baf2c7a4: Merge "[ActivityManager]: Fix the activity visibili... | Craig Mautner | 2014-01-28 | 1 | -0/+1 |
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | | | |||||
| | | | * | | | | [ActivityManager]: Fix the activity visibility state not sync between Activit... | louis_chang | 2014-01-28 | 1 | -0/+1 |
| | | | | |/ / | | | | |/| | | |||||
* | | | | | | | AArch64: Make graphics classes 64-bit compatible | Ashok Bhat | 2014-01-28 | 2 | -11/+11 |
* | | | | | | | Merge "Update PackageMonitor to recognize new 'replacing' semantics" | Christopher Tate | 2014-01-27 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update PackageMonitor to recognize new 'replacing' semantics | Christopher Tate | 2014-01-27 | 1 | -2/+2 |
* | | | | | | | | Merge "Clean up dhcp no-op logging" | Robert Greenwalt | 2014-01-27 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Clean up dhcp no-op logging | Robert Greenwalt | 2014-01-23 | 1 | -3/+3 |
* | | | | | | | | Revert "AArch64: Make graphics classes 64-bit compatible" | Narayan Kamath | 2014-01-27 | 2 | -11/+11 |
* | | | | | | | | AArch64: Make graphics classes 64-bit compatible | Ashok Bhat | 2014-01-27 | 2 | -11/+11 |
* | | | | | | | | am 38eda9c4: Remove unnecessary logging. | Craig Mautner | 2014-01-25 | 1 | -9/+0 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Remove unnecessary logging. | Craig Mautner | 2014-01-24 | 1 | -9/+0 |
* | | | | | | | | Merge "Add app version codes to procstats." | Dianne Hackborn | 2014-01-24 | 3 | -39/+54 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Add app version codes to procstats. | Dianne Hackborn | 2014-01-23 | 3 | -39/+54 |
* | | | | | | | | am 222496f8: am 5d734dbc: am e1d18f6e: am 0e3df216: am cc81bcec: Merge "Only ... | Christopher Tate | 2014-01-23 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / | |||||
| * | | | | | | am 5d734dbc: am e1d18f6e: am 0e3df216: am cc81bcec: Merge "Only send storage ... | Christopher Tate | 2014-01-23 | 1 | -1/+2 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | am e1d18f6e: am 0e3df216: am cc81bcec: Merge "Only send storage intents after... | Christopher Tate | 2014-01-22 | 1 | -1/+2 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | am 0e3df216: am cc81bcec: Merge "Only send storage intents after boot complete" | Christopher Tate | 2014-01-22 | 1 | -1/+2 |
| | | |\ \ \ \ | | | | |/ / / | |||||
| | | | * | | | Merge "Only send storage intents after boot complete" | Christopher Tate | 2014-01-22 | 1 | -1/+2 |
| | | | |\ \ \ | |||||
| | | | | * | | | Only send storage intents after boot complete | Johan Redestig | 2014-01-18 | 1 | -1/+2 |
* | | | | | | | | Merge "Battery stats improvements." | Dianne Hackborn | 2014-01-22 | 4 | -21/+75 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Battery stats improvements. | Dianne Hackborn | 2014-01-22 | 4 | -21/+75 |
* | | | | | | | | | am 46c95dfc: am b450505c: am a7a9327b: am 5474f085: am 9fc157a4: Merge "FLAG_... | Christopher Tate | 2014-01-22 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | am b450505c: am a7a9327b: am 5474f085: am 9fc157a4: Merge "FLAG_PRIVILEGED di... | Christopher Tate | 2014-01-22 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| | * | | | | | | am a7a9327b: am 5474f085: am 9fc157a4: Merge "FLAG_PRIVILEGED disappears if p... | Christopher Tate | 2014-01-22 | 1 | -0/+6 |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | |||||
| | | * | | | | | am 5474f085: am 9fc157a4: Merge "FLAG_PRIVILEGED disappears if privileged app... | Christopher Tate | 2014-01-21 | 1 | -0/+6 |
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | | | |||||
| | | | * | | | | FLAG_PRIVILEGED disappears if privileged app is updated and rebooted | Naofumi Harada | 2014-01-21 | 1 | -0/+6 |
| | | | | |/ / | | | | |/| | | |||||
* | | | | | | | am e2c9cd58: Merge "Refactor display manager service to new pattern." into kl... | Jeff Brown | 2014-01-18 | 21 | -714/+705 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Refactor display manager service to new pattern. | Jeff Brown | 2014-01-16 | 21 | -714/+705 |
* | | | | | | Merge "Add --checkin to package manager dump." | Dianne Hackborn | 2014-01-17 | 2 | -49/+124 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add --checkin to package manager dump. | Dianne Hackborn | 2014-01-17 | 2 | -49/+124 |
* | | | | | | | Merge "boot into recovery via the pre-recovery service" | Doug Zongker | 2014-01-16 | 1 | -5/+24 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | boot into recovery via the pre-recovery service | Doug Zongker | 2014-01-16 | 1 | -5/+24 |
* | | | | | | | | Fix build. | Jeff Brown | 2014-01-16 | 1 | -2/+4 |
|/ / / / / / / | |||||
* | | | | | | | resolved conflicts for merge of 6f357d32 to master | Jeff Brown | 2014-01-16 | 13 | -780/+879 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | |