| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | | | | | | | | | | | am f24687e2: Merge "Plumb display power state through display manager." into ... | Jeff Brown | 2014-04-11 | 36 | -583/+626 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | Merge "Plumb display power state through display manager." into klp-modular-dev | Jeff Brown | 2014-04-11 | 36 | -583/+626 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | Plumb display power state through display manager. | Jeff Brown | 2014-04-10 | 36 | -583/+626 | |
| * | | | | | | | | | | | | | | | | am da6b9599: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-mod... | Baligh Uddin | 2014-04-10 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into klp-modular-dev | Baligh Uddin | 2014-04-10 | 6 | -6/+6 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2014-04-09 | 6 | -6/+6 | |
| | | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | am 940e76fd: am b827f78e: Merge "Removed android.debug.JNITest from preloaded... | Narayan Kamath | 2014-04-10 | 1 | -1/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | am b827f78e: Merge "Removed android.debug.JNITest from preloaded-classes" | Narayan Kamath | 2014-04-10 | 1 | -1/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | Merge "Removed android.debug.JNITest from preloaded-classes" | Narayan Kamath | 2014-04-10 | 1 | -1/+0 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | Removed android.debug.JNITest from preloaded-classes | Ashok Bhat | 2014-03-24 | 1 | -1/+0 | |
| * | | | | | | | | | | | | | | | | am 1d26a3f1: am 09e13cc5: Merge "System services detect and register app CPU ... | Narayan Kamath | 2014-04-10 | 8 | -29/+72 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | am 09e13cc5: Merge "System services detect and register app CPU ABIs" | Narayan Kamath | 2014-04-10 | 8 | -29/+72 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | Merge "System services detect and register app CPU ABIs" | Narayan Kamath | 2014-04-10 | 8 | -29/+72 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | System services detect and register app CPU ABIs | Ramin Zaghi | 2014-04-09 | 8 | -29/+72 | |
| * | | | | | | | | | | | | | | | | | am 0fd40cb1: am 80413c9f: Merge "Re-implement native library search and copies." | Narayan Kamath | 2014-04-10 | 6 | -112/+352 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | am 80413c9f: Merge "Re-implement native library search and copies." | Narayan Kamath | 2014-04-10 | 6 | -112/+352 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | Merge "Re-implement native library search and copies." | Narayan Kamath | 2014-04-10 | 6 | -112/+352 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | ||||||
| | | | * | | | | | | | | | | | | | | Re-implement native library search and copies. | Ramin Zaghi | 2014-04-09 | 6 | -112/+352 | |
| * | | | | | | | | | | | | | | | | | am 2e8a2d20: Merge "LE: Return false if an attribute read/write is in progres... | Zhihai Xu | 2014-04-09 | 1 | -0/+60 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Merge "LE: Return false if an attribute read/write is in progress" into klp-m... | Zhihai Xu | 2014-04-09 | 1 | -0/+60 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | LE: Return false if an attribute read/write is in progress | Andre Eisenbach | 2014-04-09 | 1 | -0/+60 | |
| * | | | | | | | | | | | | | | | | | | am 8d31358f: Merge "Merge "NsdService does not clean up after exiting clients... | Jesse Gunsch | 2014-04-09 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | Merge "Merge "NsdService does not clean up after exiting clients"" into klp-m... | Jesse Gunsch | 2014-04-09 | 1 | -17/+64 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | Merge "NsdService does not clean up after exiting clients" | Dave Platt | 2014-04-08 | 1 | -17/+64 | |
| * | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp | Jeff Brown | 2014-04-09 | 5 | -119/+56 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | Merge "Move certain internal activity manager methods to new class." into klp... | Jeff Brown | 2014-04-09 | 5 | -120/+56 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | Move certain internal activity manager methods to new class. | Jeff Brown | 2014-04-08 | 5 | -120/+56 | |
| * | | | | | | | | | | | | | | | | | | | am 7a67c927: am ecdf9b19: Merge "jni: liblog reading error API incorrect" | Mark Salyzyn | 2014-04-09 | 1 | -4/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | am ecdf9b19: Merge "jni: liblog reading error API incorrect" | Mark Salyzyn | 2014-04-09 | 1 | -4/+4 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | Merge "jni: liblog reading error API incorrect" | Mark Salyzyn | 2014-04-09 | 1 | -4/+4 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | jni: liblog reading error API incorrect | Mark Salyzyn | 2014-04-08 | 1 | -4/+4 | |
| * | | | | | | | | | | | | | | | | | | | am b6ab8c17: am a6f5e79d: Merge "Allow connections to multiple zygotes." | Narayan Kamath | 2014-04-09 | 1 | -116/+201 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | am a6f5e79d: Merge "Allow connections to multiple zygotes." | Narayan Kamath | 2014-04-09 | 1 | -116/+201 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | Merge "Allow connections to multiple zygotes." | Narayan Kamath | 2014-04-09 | 1 | -116/+201 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | Allow connections to multiple zygotes. | Narayan Kamath | 2014-04-09 | 1 | -116/+201 | |
| | | |/ / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | am 05f980d4: am d4b64409: Merge "Make zygotes aware of their supported ABIs." | Narayan Kamath | 2014-04-09 | 3 | -66/+84 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | am d4b64409: Merge "Make zygotes aware of their supported ABIs." | Narayan Kamath | 2014-04-09 | 3 | -66/+84 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | Merge "Make zygotes aware of their supported ABIs." | Narayan Kamath | 2014-04-09 | 3 | -66/+84 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | Make zygotes aware of their supported ABIs. | Narayan Kamath | 2014-04-09 | 3 | -66/+84 | |
| * | | | | | | | | | | | | | | | | | | | | am 3856a219: am cecfb94f: Merge "Clean up argc / argv processing for runtime ... | Narayan Kamath | 2014-04-09 | 3 | -60/+85 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | am cecfb94f: Merge "Clean up argc / argv processing for runtime args." | Narayan Kamath | 2014-04-09 | 3 | -60/+85 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | | Merge "Clean up argc / argv processing for runtime args." | Narayan Kamath | 2014-04-09 | 3 | -60/+85 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | ||||||
| | | | * | | | | | | | | | | | | | | | | | Clean up argc / argv processing for runtime args. | Narayan Kamath | 2014-04-09 | 3 | -60/+85 | |
| | | |/ / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | am 00cfbe82: am a5608acb: Merge "Don\'t allow MemoryFiles of negative length." | Narayan Kamath | 2014-04-09 | 1 | -2/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | am a5608acb: Merge "Don\'t allow MemoryFiles of negative length." | Narayan Kamath | 2014-04-09 | 1 | -2/+7 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | Merge "Don't allow MemoryFiles of negative length." | Narayan Kamath | 2014-04-09 | 1 | -2/+7 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | Don't allow MemoryFiles of negative length. | Narayan Kamath | 2014-04-08 | 1 | -2/+7 | |
| * | | | | | | | | | | | | | | | | | | | am ea72cdf2: Merge "Move display power controller to display manager service.... | Jeff Brown | 2014-04-09 | 10 | -336/+309 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | Merge "Move display power controller to display manager service. (DO NOT MERG... | Jeff Brown | 2014-04-09 | 10 | -336/+309 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / | | |/| | | | | | / / / / / / / / / / | | |_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | Move display power controller to display manager service. (DO NOT MERGE) | Jeff Brown | 2014-04-08 | 10 | -336/+309 | |
| | | | |_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | ||||||
 |
index : frameworks_base.git | |
| frameworks/base | git repository hosting |
| summaryrefslogtreecommitdiffstats |