summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 8eb3ece8: am 1d2daa78: Merge "Remove FD optimization case for decodeStream...John Reck2013-09-101-15/+1
|\
| * am 1d2daa78: Merge "Remove FD optimization case for decodeStream" into klp-devJohn Reck2013-09-101-15/+1
| |\
| | * Merge "Remove FD optimization case for decodeStream" into klp-devJohn Reck2013-09-101-15/+1
| | |\
| | | * Remove FD optimization case for decodeStreamJohn Reck2013-09-091-15/+1
* | | | am 488e925f: am 8716c081: Merge "Use correct timescale for "date taken" field...Marco Nelissen2013-09-101-2/+3
|\ \ \ \ | |/ / /
| * | | am 8716c081: Merge "Use correct timescale for "date taken" field" into klp-devMarco Nelissen2013-09-101-2/+3
| |\ \ \ | | |/ /
| | * | Merge "Use correct timescale for "date taken" field" into klp-devMarco Nelissen2013-09-101-2/+3
| | |\ \
| | | * | Use correct timescale for "date taken" fieldMarco Nelissen2013-08-211-2/+3
* | | | | am 23d6b7b3: am 618f8cc5: Merge "Don\'t leave space for summary text if it\'s...Amith Yamasani2013-09-101-3/+4
|\ \ \ \ \ | |/ / / /
| * | | | am 618f8cc5: Merge "Don\'t leave space for summary text if it\'s an empty str...Amith Yamasani2013-09-101-3/+4
| |\ \ \ \ | | |/ / /
| | * | | Merge "Don't leave space for summary text if it's an empty string" into klp-devAmith Yamasani2013-09-101-3/+4
| | |\ \ \
| | | * | | Don't leave space for summary text if it's an empty stringAmith Yamasani2013-09-091-3/+4
* | | | | | am 9b448989: am e3d0f022: Merge "Don\'t set Allocation mSize when we have no ...Stephen Hines2013-09-091-1/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am e3d0f022: Merge "Don\'t set Allocation mSize when we have no Type." into k...Stephen Hines2013-09-091-1/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Don't set Allocation mSize when we have no Type." into klp-devStephen Hines2013-09-101-1/+4
| | |\ \ \ \
| | | * | | | Don't set Allocation mSize when we have no Type.Stephen Hines2013-09-091-1/+4
* | | | | | | am 85454403: (-s ours) am 5f5e8477: (-s ours) Merge "Import translations. DO ...Baligh Uddin2013-09-090-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 5f5e8477: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-09-090-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-09-104-4/+4
| | |\ \ \ \ \
| | | * | | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-094-4/+4
* | | | | | | | am ad53a540: (-s ours) am a244732d: (-s ours) Merge "Import translations. DO ...Baligh Uddin2013-09-090-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am a244732d: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-09-090-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-09-1060-59/+287
| | |\ \ \ \ \ \
| | | * | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-0960-59/+287
| | | |/ / / / /
* | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-09-104-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-094-4/+4
* | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-09-1060-59/+287
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-0960-59/+287
| |/ / / / / / / /
* | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-09-101-9/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-091-9/+9
| |/ / / / / / / /
* | | | | | | | | am 7b69c566: am 9e2c661b: Merge "Fix getCallingPackage() to handle reentrance...Jeff Sharkey2013-09-091-25/+34
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | am 9e2c661b: Merge "Fix getCallingPackage() to handle reentrance." into klp-devJeff Sharkey2013-09-091-25/+34
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge "Fix getCallingPackage() to handle reentrance." into klp-devJeff Sharkey2013-09-101-25/+34
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix getCallingPackage() to handle reentrance.Jeff Sharkey2013-09-091-25/+34
* | | | | | | | | | am 78bb372f: am af927234: Merge changes I7b3f4c68,I9f022a08 into klp-devJeff Sharkey2013-09-0912-117/+128
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am af927234: Merge changes I7b3f4c68,I9f022a08 into klp-devJeff Sharkey2013-09-0912-117/+128
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge changes I7b3f4c68,I9f022a08 into klp-devJeff Sharkey2013-09-1012-117/+128
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Rename offer() to add(), remove/hide some APIs.Jeff Sharkey2013-09-099-49/+42
| | | * | | | | | | Sort order is sticky for session, back leaves.Jeff Sharkey2013-09-093-68/+86
* | | | | | | | | | am 404c4855: am 392c76b1: Merge "Clarify InputDevice#getControllerNumber docu...Jeff Brown2013-09-091-4/+9
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 392c76b1: Merge "Clarify InputDevice#getControllerNumber documentation" in...Jeff Brown2013-09-091-4/+9
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "Clarify InputDevice#getControllerNumber documentation" into klp-devJeff Brown2013-09-101-4/+9
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Clarify InputDevice#getControllerNumber documentationMichael Wright2013-09-031-4/+9
* | | | | | | | | | | am 37b7632a: am bc916b22: Fix checkbuild error due to javadoc reference to hi...Sandeep Siddhartha2013-09-091-2/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am bc916b22: Fix checkbuild error due to javadoc reference to hidden classSandeep Siddhartha2013-09-091-2/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Fix checkbuild error due to javadoc reference to hidden classSandeep Siddhartha2013-09-101-2/+1
* | | | | | | | | | | Merge "Add View constructor that supplies a default style resource"Alan Viverette2013-09-1098-419/+1130
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add View constructor that supplies a default style resourceAlan Viverette2013-09-0998-419/+1130
* | | | | | | | | | | | am 9d5182f9: am 11f2b42d: Remove system user id for cm testsXia Wang2013-09-090-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | am 11f2b42d: Remove system user id for cm testsXia Wang2013-09-091-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |