summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
* Add support for MNC=00Mattias Petersson2013-07-261-0/+1
* am f094eefc: am c5de9c35: Merge "Track libcore API update."Elliott Hughes2013-07-111-0/+2
|\
| * am c5de9c35: Merge "Track libcore API update."Elliott Hughes2013-07-111-0/+2
| |\
| | * Track libcore API update.Elliott Hughes2013-07-111-0/+2
* | | am 0b18c149: am 0f50cb31: Merge "Fix build."Elliott Hughes2013-07-091-0/+1
|\ \ \ | |/ /
| * | am 0f50cb31: Merge "Fix build."Elliott Hughes2013-07-091-0/+1
| |\ \ | | |/
| | * Fix build.Elliott Hughes2013-07-091-0/+1
* | | am 86aa1953: am 2a26547f: Merge "Track libcore API update."Elliott Hughes2013-07-081-0/+2
|\ \ \ | |/ /
| * | am 2a26547f: Merge "Track libcore API update."Elliott Hughes2013-07-081-0/+2
| |\ \ | | |/
| | * Track libcore API update.Elliott Hughes2013-07-081-0/+2
* | | am e88fe7f4: am 94fed1c5: Merge "Track libcore API update."Elliott Hughes2013-07-011-0/+2
|\ \ \ | |/ /
| * | am 94fed1c5: Merge "Track libcore API update."Elliott Hughes2013-07-011-0/+2
| |\ \ | | |/
| | * Track libcore API update.Elliott Hughes2013-07-011-0/+2
* | | am 7c56325d: am c26e5505: Merge "Track libcore API update."Elliott Hughes2013-07-011-0/+84
|\ \ \ | |/ /
| * | am c26e5505: Merge "Track libcore API update."Elliott Hughes2013-07-011-0/+84
| |\ \ | | |/
| | * Track libcore API update.Elliott Hughes2013-07-011-0/+84
* | | am c63c0682: am e3b94f05: Merge "Track libcore API change."Elliott Hughes2013-06-281-0/+1
|\ \ \ | |/ /
| * | am e3b94f05: Merge "Track libcore API change."Elliott Hughes2013-06-281-0/+1
| |\ \ | | |/
| | * Track libcore API change.Elliott Hughes2013-06-281-0/+1
* | | am 324993ab: am 5216f11e: Merge "Track libcore API update."Elliott Hughes2013-06-281-0/+9
|\ \ \ | |/ /
| * | am 5216f11e: Merge "Track libcore API update."Elliott Hughes2013-06-281-0/+9
| |\ \ | | |/
| | * Track libcore API update.Elliott Hughes2013-06-281-0/+9
* | | am ce566b50: am ee66531f: Merge "Track libcore API update."Elliott Hughes2013-06-281-0/+2
|\ \ \ | |/ /
| * | am ee66531f: Merge "Track libcore API update."Elliott Hughes2013-06-281-0/+2
| |\ \ | | |/
| | * Track libcore API update.Elliott Hughes2013-06-281-0/+2
* | | am a9510297: am 505974eb: Merge "Track libcore API update."Elliott Hughes2013-06-281-0/+12
|\ \ \ | |/ /
| * | am 505974eb: Merge "Track libcore API update."Elliott Hughes2013-06-281-0/+12
| |\ \ | | |/
| | * Track libcore API update.Elliott Hughes2013-06-281-0/+12
* | | am b87e6138: am 618ed234: Merge "Track nio API change."Elliott Hughes2013-06-141-1/+1
|\ \ \ | |/ /
| * | am 618ed234: Merge "Track nio API change."Elliott Hughes2013-06-141-1/+1
| |\ \ | | |/
| | * Track nio API change.Elliott Hughes2013-06-141-1/+1
* | | am 37490462: Merge "Unhide MediaExtractor.getPsshInfo()" into jb-mr2-devMarco Nelissen2013-06-111-0/+1
|\ \ \
| * \ \ Merge "Unhide MediaExtractor.getPsshInfo()" into jb-mr2-devMarco Nelissen2013-06-111-0/+1
| |\ \ \
| | * | | Unhide MediaExtractor.getPsshInfo()Marco Nelissen2013-06-101-0/+1
* | | | | am 8fb120b6: Merge "add ViewGroup\'s layoutMode attribute to public resources...Scott Main2013-06-111-0/+1
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | add ViewGroup's layoutMode attribute to public resourcesScott Main2013-06-101-0/+1
| |/ /
* | | am 70b74646: Merge "Track libcore changes."Elliott Hughes2013-06-061-6/+13
|\ \ \ | | |/ | |/|
| * | Track libcore changes.Elliott Hughes2013-06-061-6/+13
* | | am 636af7a1: Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr...Jeff Brown2013-05-301-1/+1
|\ \ \ | | |/ | |/|
| * | Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-devJeff Brown2013-05-311-1/+1
| |\ \
| | * | Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity.Jeff Brown2013-05-301-1/+1
* | | | am 054255c6: Merge "Unhide action to launch Daydream settings." into jb-mr2-devDaniel Sandler2013-05-301-0/+1
|\ \ \ \ | |/ / /
| * | | Merge "Unhide action to launch Daydream settings." into jb-mr2-devDaniel Sandler2013-05-301-0/+1
| |\ \ \ | | |/ / | |/| |
| | * | Unhide action to launch Daydream settings.Daniel Sandler2013-05-291-0/+1
* | | | am 673903a2: Merge "android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG" into j...Lajos Molnar2013-05-291-1/+0
|\ \ \ \ | |/ / /
| * | | Merge "android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG" into jb-mr2-devLajos Molnar2013-05-291-1/+0
| |\ \ \
| | * | | android.media.MediaMuxer: remove SAMPLE_SYNC_FLAGLajos Molnar2013-05-291-1/+0
* | | | | am 6ea0636a: Merge "Revert "Revert "Change GATT_FAILURE from 0 to 0x101""" in...Matthew Xie2013-05-281-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Revert "Revert "Change GATT_FAILURE from 0 to 0x101""Matthew Xie2013-05-281-1/+1
| | |/ / | |/| |
* | | | am 27e45361: Merge "Revert "Change GATT_FAILURE from 0 to 0x101"" into jb-mr2...Matthew Xie2013-05-261-1/+1
|\ \ \ \ | |/ / /