summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove obsolete assets from target /system/media/video/Glenn Kasten2013-09-133-10/+11
* Merge "Document the order of values returned by keyAt()." into klp-devFlavio Lerda2013-09-126-6/+108
|\
| * Document the order of values returned by keyAt().Flavio Lerda2013-09-086-6/+108
* | Merge "Ignore ON_AFTER_RELEASE for partial wake locks." into klp-devJeff Brown2013-09-121-3/+4
|\ \
| * | Ignore ON_AFTER_RELEASE for partial wake locks.Jeff Brown2013-09-101-3/+4
* | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-09-121-9/+9
|\ \ \
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-09-111-9/+9
* | | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-09-1259-264/+118
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-1159-264/+118
| |/ / /
* | | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-09-1260-468/+363
|\ \ \ \
| * | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-1160-468/+363
| |/ / /
* | | | Merge "consumer_ir: add length to get carrier freqs" into klp-devAlex Ray2013-09-121-1/+1
|\ \ \ \
| * | | | consumer_ir: add length to get carrier freqsAlex Ray2013-09-111-1/+1
* | | | | Merge "Revert "Add permissions for the InCallUI Split."" into klp-devSelim Gurun2013-09-122-7/+0
|\ \ \ \ \
| * | | | | Revert "Add permissions for the InCallUI Split."Selim Gurun2013-09-122-7/+0
* | | | | | Merge "consumer ir: clarify @link in documentation" into klp-devAlex Ray2013-09-121-4/+7
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | consumer ir: clarify @link in documentationAlex Ray2013-09-111-4/+7
* | | | | | Merge "Use setAirplaneMode() API for Connectivity Manager tests" into klp-devXia Wang2013-09-123-22/+11
|\ \ \ \ \ \
| * | | | | | Use setAirplaneMode() API for Connectivity Manager testsXia Wang2013-09-113-22/+11
* | | | | | | Merge "MediaFormat.java: Add KEY_MAX_WIDTH and KEY_MAX_HEIGHT" into klp-devLajos Molnar2013-09-122-0/+26
|\ \ \ \ \ \ \
| * | | | | | | MediaFormat.java: Add KEY_MAX_WIDTH and KEY_MAX_HEIGHTLajos Molnar2013-09-062-0/+26
* | | | | | | | Merge "Add HOTWORD as an AudioSource" into klp-devEric Laurent2013-09-126-13/+38
|\ \ \ \ \ \ \ \
| * | | | | | | | Add HOTWORD as an AudioSourceEric Laurent2013-09-106-13/+38
* | | | | | | | | Merge changes Ia6300c23,Idd2ae8ad into klp-devEino-Ville Talvala2013-09-1220-1059/+1455
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Camera2: Immutable metadataEino-Ville Talvala2013-09-1120-898/+1005
| * | | | | | | | | Camera2: Listener rework and other API updatesEino-Ville Talvala2013-09-115-170/+459
* | | | | | | | | | Merge "Remove dependency on JNIHelp header side effects." into klp-devRuben Brunk2013-09-1226-0/+72
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove dependency on JNIHelp header side effects.Ruben Brunk2013-09-1026-0/+72
* | | | | | | | | | | Merge "Change selection highlight for intent disambig dialog" into klp-devAmith Yamasani2013-09-1110-31/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Change selection highlight for intent disambig dialogAmith Yamasani2013-09-1110-31/+1
* | | | | | | | | | | | Merge "Pass subtitle track properties to SubtitleController" into klp-devChong Zhang2013-09-112-4/+44
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Pass subtitle track properties to SubtitleControllerChong Zhang2013-09-112-4/+44
* | | | | | | | | | | | | Merge "Scale feels too quick in relation to movement" into klp-devMindy Pereira2013-09-111-5/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Scale feels too quick in relation to movementMindy Pereira2013-09-091-5/+12
* | | | | | | | | | | | | | Merge "Fix another off-by-one error in ZipFileRO" into klp-devKenny Root2013-09-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix another off-by-one error in ZipFileROKenny Root2013-09-111-1/+1
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge "ImageReader: Skip size check for BLOB format" into klp-devZhijun He2013-09-111-7/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | ImageReader: Skip size check for BLOB formatZhijun He2013-09-111-7/+14
* | | | | | | | | | | | | | Merge "Fix exceptions in the Flp Hal layer: - JNI exception accessing a geofe...destradaa2013-09-112-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix exceptions in the Flp Hal layer:destradaa2013-09-112-2/+8
* | | | | | | | | | | | | | | Merge "Action bar refactoring and transitions" into klp-devAdam Powell2013-09-114-85/+160
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Action bar refactoring and transitionsAdam Powell2013-09-104-85/+160
* | | | | | | | | | | | | | | | Merge changes Ib1274847,I2eb2a1bf into klp-devJeff Sharkey2013-09-119-92/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix SDK build.Jeff Sharkey2013-09-111-8/+0
| * | | | | | | | | | | | | | | Request all tethering interfaces, fix corruption.Jeff Sharkey2013-09-108-84/+52
* | | | | | | | | | | | | | | | Merge "Reconcile differences between zip implementations" into klp-devKenny Root2013-09-111-65/+129
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Reconcile differences between zip implementationsKenny Root2013-09-111-65/+129
* | | | | | | | | | | | | | | | Merge "Improve some javadoc related to isProviderEnabled() apis" into klp-devTom O'Neill2013-09-113-10/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Improve some javadoc related to isProviderEnabled() apisTom O'Neill2013-09-113-10/+25
* | | | | | | | | | | | | | | | | Merge "Add permissions for the InCallUI Split." into klp-devSantos Cordon2013-09-112-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | |