Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am ad8d25e8: am 90654afb: Revert "Enable OMAP4 SGX workaround for OMAP3 too" | Simon Wilson | 2014-05-29 | 1 | -1/+1 |
|\ | |||||
| * | am 90654afb: Revert "Enable OMAP4 SGX workaround for OMAP3 too" | Simon Wilson | 2014-05-29 | 1 | -1/+1 |
| |\ | |||||
| | * | Revert "Enable OMAP4 SGX workaround for OMAP3 too" | Simon Wilson | 2014-05-29 | 1 | -1/+1 |
* | | | am aefe55f0: Remove dependencies on runtime_libdvm and libdvm.so in general | Brian Carlstrom | 2014-05-29 | 1 | -6/+9 |
|\ \ \ | |||||
| * | | | Remove dependencies on runtime_libdvm and libdvm.so in general | Brian Carlstrom | 2014-05-28 | 1 | -6/+9 |
* | | | | am e77cb931: am 259c2508: am 03e2f8fa: Merge "Modified atrace.cpp to recogniz... | Elliott Hughes | 2014-05-29 | 1 | -0/+1 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | am 259c2508: am 03e2f8fa: Merge "Modified atrace.cpp to recognize ATRACE_TAG_... | Elliott Hughes | 2014-05-29 | 1 | -0/+1 |
| |\ \ \ | |||||
| | * \ \ | am 03e2f8fa: Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC." | Elliott Hughes | 2014-05-29 | 1 | -0/+1 |
| | |\ \ \ | |||||
| | | * \ \ | Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC." | Elliott Hughes | 2014-05-29 | 1 | -0/+1 |
| | | |\ \ \ | |||||
| | | | * | | | Modified atrace.cpp to recognize ATRACE_TAG_BIONIC. | Brigid Smith | 2014-05-28 | 1 | -0/+1 |
* | | | | | | | am 28ec0303: am e67810fd: am 97a51ad4: Merge "Move to dalvik.vm.lib.2 to forc... | Brian Carlstrom | 2014-05-28 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am e67810fd: am 97a51ad4: Merge "Move to dalvik.vm.lib.2 to force default to ... | Brian Carlstrom | 2014-05-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | am 97a51ad4: Merge "Move to dalvik.vm.lib.2 to force default to libart" | Brian Carlstrom | 2014-05-28 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Merge "Move to dalvik.vm.lib.2 to force default to libart" | Brian Carlstrom | 2014-05-28 | 1 | -1/+1 |
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | | | * | | | Move to dalvik.vm.lib.2 to force default to libart | Brian Carlstrom | 2014-05-28 | 1 | -1/+1 |
| | | |/ / / | |||||
* | | | | | | am c4ac3124: Move to dalvik.vm.lib.2 to force default to libart | Brian Carlstrom | 2014-05-28 | 1 | -1/+1 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Move to dalvik.vm.lib.2 to force default to libart | Brian Carlstrom | 2014-05-28 | 1 | -1/+1 |
* | | | | | | Merge "SurfaceFlinger: Add sourceCrop to screenshot" | Dan Stoza | 2014-05-28 | 13 | -43/+104 |
|\ \ \ \ \ \ | |||||
| * | | | | | | SurfaceFlinger: Add sourceCrop to screenshot | Dan Stoza | 2014-05-23 | 13 | -43/+104 |
* | | | | | | | am 203fe88e: (-s ours) DO NOT MERGE Allow "telecomm" service to be registered... | Santos Cordon | 2014-05-28 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | DO NOT MERGE Allow "telecomm" service to be registered with the phone UID. | Santos Cordon | 2014-05-28 | 1 | -0/+1 |
* | | | | | | | am cfe99e79: merge in master-release history after reset to 102a072d900d56c54... | The Android Automerger | 2014-05-28 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | merge in master-release history after reset to 102a072d900d56c54ced6144666d35... | The Android Automerger | 2014-05-22 | 0 | -0/+0 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | merge in master-release history after reset to fca1b54031a1ba2a3c82bbbbe71716... | The Android Automerger | 2014-05-22 | 0 | -0/+0 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | merge in master-release history after reset to b9e879d429945cebc12a52e1ceaf08... | The Android Automerger | 2014-05-21 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | merge in master-release history after reset to ca2fbf6982828562a9dee60a68d7cb... | The Android Automerger | 2014-05-20 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ | merge in master-release history after reset to 2fc72d1c0294fb759380604ea906ce... | The Android Automerger | 2014-05-19 | 0 | -0/+0 |
| | | | | |\ \ \ \ \ \ | |||||
| | | | | | * \ \ \ \ \ | merge in master-release history after reset to 6b4e02f1cbdc55126cae9d2ce58864... | The Android Automerger | 2014-05-18 | 0 | -0/+0 |
| | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | * \ \ \ \ \ | merge in master-release history after reset to 6b4e02f1cbdc55126cae9d2ce58864... | The Android Automerger | 2014-05-17 | 0 | -0/+0 |
| | | | | | | |\ \ \ \ \ \ | | | | | | |/ / / / / / / | |||||
| | | | | | | * | | | | | | merge in master-release history after reset to 574b641173debed3c0714628dba963... | The Android Automerger | 2014-05-15 | 0 | -0/+0 |
| | | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | | * \ \ \ \ \ | merge in master-release history after reset to 2f9a3e73bfd9f51b8e08b16b0bfdea... | The Android Automerger | 2014-05-14 | 0 | -0/+0 |
| | | | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | | | * \ \ \ \ \ | merge in master-release history after reset to d763fc7822e7ab1eb593d479c0354a... | The Android Automerger | 2014-05-13 | 0 | -0/+0 |
| | | | | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | | | | * \ \ \ \ \ | merge in master-release history after reset to 2f3dca149a2bcae96f18e38f7ba99a... | The Android Automerger | 2014-05-12 | 0 | -0/+0 |
| | | | | | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | | | | | * \ \ \ \ \ | merge in master-release history after reset to 2f3dca149a2bcae96f18e38f7ba99a... | The Android Automerger | 2014-05-11 | 0 | -0/+0 |
| | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | |/ / / / / / / | |||||
| | | | | | | | | | | * | | | | | | merge in master-release history after reset to 2f3dca149a2bcae96f18e38f7ba99a... | The Android Automerger | 2014-05-10 | 0 | -0/+0 |
| | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | |/ / / / / / / | |||||
| | | | | | | | | | | * | | | | | | merge in master-release history after reset to c6e0c64632bdf9183b90307f1a39bd... | The Android Automerger | 2014-05-08 | 0 | -0/+0 |
| | | | | | | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | | | | | | * \ \ \ \ \ | merge in master-release history after reset to c6e0c64632bdf9183b90307f1a39bd... | The Android Automerger | 2014-05-07 | 0 | -0/+0 |
| | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | |/ / / / / / / | |||||
| | | | | | | | | | | | * | | | | | | merge in master-release history after reset to 4522f5749d46adec0189c8dfe7f8e8... | The Android Automerger | 2014-05-07 | 0 | -0/+0 |
| | | | | | | | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | | | | | | | * \ \ \ \ \ | merge in master-release history after reset to 4522f5749d46adec0189c8dfe7f8e8... | The Android Automerger | 2014-05-06 | 0 | -0/+0 |
| | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | |/ / / / / / / | |||||
| | | | | | | | | | | | | * | | | | | | merge in master-release history after reset to 98e1ebc026726ba045cea69b1b8c37... | The Android Automerger | 2014-05-05 | 0 | -0/+0 |
| | | | | | | | | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | | | | | | | | * \ \ \ \ \ | merge in master-release history after reset to 98e1ebc026726ba045cea69b1b8c37... | The Android Automerger | 2014-05-04 | 0 | -0/+0 |
| | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | |/ / / / / / / | |||||
| | | | | | | | | | | | | | * | | | | | | merge in master-release history after reset to 98e1ebc026726ba045cea69b1b8c37... | The Android Automerger | 2014-05-03 | 0 | -0/+0 |
| | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | |/ / / / / / / | |||||
| | | | | | | | | | | | | | * | | | | | | merge in master-release history after reset to bd81c258c2ac9f41a9263a20953d6f... | The Android Automerger | 2014-05-01 | 0 | -0/+0 |
| | | | | | | | | | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | | | | | | | | | * \ \ \ \ \ | merge in master-release history after reset to 791781bfb8cdcdf90e32968159603e... | The Android Automerger | 2014-04-30 | 0 | -0/+0 |
| | | | | | | | | | | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | | | | | | | | | | * \ \ \ \ \ | merge in master-release history after reset to aaa22fd38c1d2ad1707f8178019196... | The Android Automerger | 2014-04-29 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | | | | | | | | | | | * \ \ \ \ \ | merge in master-release history after reset to 498b4a0950f8d613b0ba6cb2e393a0... | The Android Automerger | 2014-04-28 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | | | | | | | | | | | | * \ \ \ \ \ | merge in master-release history after reset to 498b4a0950f8d613b0ba6cb2e393a0... | The Android Automerger | 2014-04-27 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | |/ / / / / / / | |||||
| | | | | | | | | | | | | | | | | | * | | | | | | merge in master-release history after reset to 498b4a0950f8d613b0ba6cb2e393a0... | The Android Automerger | 2014-04-26 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | |/ / / / / / / | |||||
| | | | | | | | | | | | | | | | | | * | | | | | | merge in master-release history after reset to 943de2f71beff9566cc58ce5820495... | The Android Automerger | 2014-04-24 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | | | | | | | | | | | | | * \ \ \ \ \ | merge in master-release history after reset to master | The Android Automerger | 2014-04-22 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ |