summaryrefslogtreecommitdiff
path: root/core/java/android
Commit message (Expand)AuthorAgeFilesLines
* am e495a5a3: am cb15fb60: am 0d4916f1: am c3036a12: Merge "Before requerying ...Marco Nelissen2014-01-151-1/+1
|\
| * am cb15fb60: am 0d4916f1: am c3036a12: Merge "Before requerying a cursor, che...Marco Nelissen2014-01-151-1/+1
| |\
| | * am 0d4916f1: am c3036a12: Merge "Before requerying a cursor, check if it is c...Marco Nelissen2014-01-151-1/+1
| | |\
| | | * Merge "Before requerying a cursor, check if it is closed."Marco Nelissen2014-01-151-1/+1
| | | |\
| | | | * Before requerying a cursor, check if it is closed.jangwon.lee2013-11-111-1/+1
* | | | | Merge changes I86b3fa60,I7fa4e847 into klp-modular-devMatthew Xie2014-01-149-106/+408
|\ \ \ \ \
| * | | | | BLE peripheral mode (3/4): Add peripheral mode API.Wei Wang2014-01-138-93/+394
| * | | | | NPE in BluetoothSocket.write()Zhihai Xu2014-01-131-13/+14
* | | | | | am cce06eda: am b3436359: am e05190ea: am 85f98508: Merge "Docfixes: three ty...John Spurlock2014-01-146-13/+13
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am b3436359: am e05190ea: am 85f98508: Merge "Docfixes: three typos and escap...John Spurlock2014-01-146-13/+13
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | am e05190ea: am 85f98508: Merge "Docfixes: three typos and escape */*." into ...John Spurlock2014-01-146-13/+13
| | |\ \ \ \
| | | * \ \ \ am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docsJohn Spurlock2014-01-146-13/+13
| | | |\ \ \ \
| | | | * | | | Docfixes: three typos and escape */*.John Spurlock2014-01-066-13/+13
* | | | | | | | am d34950cf: am 80b0496a: am 2db26788: am e71afc2e: Merge "Revert "Hide Asset...Narayan Kamath2014-01-141-3/+0
|\| | | | | | |
| * | | | | | | am 80b0496a: am 2db26788: am e71afc2e: Merge "Revert "Hide AssetInputStream.g...Narayan Kamath2014-01-141-3/+0
| |\| | | | | |
| | * | | | | | am 2db26788: am e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt.""Narayan Kamath2014-01-141-3/+0
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | | * | | | | Merge "Revert "Hide AssetInputStream.getAssetInt.""Narayan Kamath2014-01-141-3/+0
| | | |\ \ \ \ \
| | | | * | | | | Revert "Hide AssetInputStream.getAssetInt."Narayan Kamath2014-01-141-3/+0
* | | | | | | | | am 7f4dd912: am 271b28ac: am 80213160: am ac8ccc3c: Merge "Hide AssetInputStr...Narayan Kamath2014-01-141-0/+3
|\| | | | | | | | | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | am 271b28ac: am 80213160: am ac8ccc3c: Merge "Hide AssetInputStream.getAssetI...Narayan Kamath2014-01-141-0/+3
| |\| | | | | |
| | * | | | | | am 80213160: am ac8ccc3c: Merge "Hide AssetInputStream.getAssetInt."Narayan Kamath2014-01-141-0/+3
| | |\| | | | |
| | | * | | | | Merge "Hide AssetInputStream.getAssetInt."Narayan Kamath2014-01-141-0/+3
| | | |\| | | |
| | | | * | | | Hide AssetInputStream.getAssetInt.Narayan Kamath2014-01-141-0/+3
* | | | | | | | am f588d2df: am d0ec6d8c: am bc2a449a: am cb4d3ec1: Merge "Fix preference put...Narayan Kamath2014-01-131-2/+4
|\| | | | | | |
| * | | | | | | am d0ec6d8c: am bc2a449a: am cb4d3ec1: Merge "Fix preference puts with "null"...Narayan Kamath2014-01-131-2/+4
| |\| | | | | |
| | * | | | | | am bc2a449a: am cb4d3ec1: Merge "Fix preference puts with "null" values."Narayan Kamath2014-01-131-2/+4
| | |\| | | | |
| | | * | | | | Merge "Fix preference puts with "null" values."Narayan Kamath2014-01-131-2/+4
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | Fix preference puts with "null" values.Narayan Kamath2014-01-081-2/+4
* | | | | | | | Implement ActivityView.Craig Mautner2014-01-102-0/+166
* | | | | | | | Merge "Allow for the possibility of null ActivityContainer" into klp-modular-devCraig Mautner2014-01-102-7/+28
|\ \ \ \ \ \ \ \
| * | | | | | | | Allow for the possibility of null ActivityContainerCraig Mautner2014-01-102-7/+28
* | | | | | | | | am f1fbe113: am 4ba1bbad: am 5fbcb134: am 35b7de4c: Merge "Cursor leakage due...Christopher Tate2014-01-091-3/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / /
| * | | | | | | am 4ba1bbad: am 5fbcb134: am 35b7de4c: Merge "Cursor leakage due to cancellat...Christopher Tate2014-01-091-3/+10
| |\| | | | | |
| | * | | | | | am 5fbcb134: am 35b7de4c: Merge "Cursor leakage due to cancellation signal"Christopher Tate2014-01-091-3/+10
| | |\| | | | |
| | | * | | | | Merge "Cursor leakage due to cancellation signal"Christopher Tate2014-01-091-3/+10
| | | |\ \ \ \ \
| | | | * | | | | Cursor leakage due to cancellation signalPeter Eliasson2013-12-191-3/+10
* | | | | | | | | Merge "Add flag to force public virtual display to show own content." into kl...Jeff Brown2014-01-091-2/+19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add flag to force public virtual display to show own content.Jeff Brown2014-01-071-2/+19
* | | | | | | | | | Merge "Extend stack management to other displays." into klp-modular-devCraig Mautner2014-01-084-4/+43
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Extend stack management to other displays.Craig Mautner2014-01-064-4/+43
* | | | | | | | | | | am d9e708e3: am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added missing USB ...Mike Lockwood2014-01-081-3/+46
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am 12ec2e6d: am 99206593: am 9607d78f: Merge "Added missing USB device descri...Mike Lockwood2014-01-081-3/+46
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | am 99206593: am 9607d78f: Merge "Added missing USB device descriptor fields n...Mike Lockwood2014-01-081-3/+46
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Merge "Added missing USB device descriptor fields needed for intent filters"Mike Lockwood2014-01-081-3/+46
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Added missing USB device descriptor fields needed for intent filtersRobin Cutshaw2012-11-291-3/+46
* | | | | | | | | | | | am 651807fc: am 3f589e5d: am 2842bd02: am de8c3cf1: Merge "AArch64: Use long ...Narayan Kamath2014-01-084-38/+36
|\| | | | | | | | | | |
| * | | | | | | | | | | am 3f589e5d: am 2842bd02: am de8c3cf1: Merge "AArch64: Use long for pointers ...Narayan Kamath2014-01-084-38/+36
| |\| | | | | | | | | |
| | * | | | | | | | | | am 2842bd02: am de8c3cf1: Merge "AArch64: Use long for pointers in App/Backup"Narayan Kamath2014-01-084-38/+36
| | |\| | | | | | | | |
| | | * | | | | | | | | AArch64: Use long for pointers in App/BackupAshok Bhat2014-01-084-38/+36
* | | | | | | | | | | | am 72a8fe6d: am 74661ff1: am b5558817: am 002ae75b: Merge "AArch64: Use long ...Narayan Kamath2014-01-082-59/+60
|\| | | | | | | | | | |