summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix StaleDataException in changeCursorstaging/cm-14.0Walter Jang2016-03-241-1/+1
* Output shorter lines for TLD patternSiyamed Sinir2015-11-251-4/+27
* am f7570b7c: am 76bfd10a: (-s ours) am 1bd8dec0: Merge "Fix breakage from gif...Derek Sollenberger2015-08-270-0/+0
|\
| * am 76bfd10a: (-s ours) am 1bd8dec0: Merge "Fix breakage from giflib update"Derek Sollenberger2015-08-270-0/+0
| |\
| | * am 1bd8dec0: Merge "Fix breakage from giflib update"Derek Sollenberger2015-08-241-2/+2
| | |\
* | | | add a logtag for framework metricsChris Wren2015-08-251-0/+5
* | | | am 6448c467: am 1bd8dec0: Merge "Fix breakage from giflib update"Derek Sollenberger2015-08-241-2/+2
|\| | |
| * | | am 1bd8dec0: Merge "Fix breakage from giflib update"Derek Sollenberger2015-08-241-2/+2
| |\ \ \ | | |/ / | |/| / | | |/
| | * Merge "Fix breakage from giflib update"Derek Sollenberger2015-08-241-2/+2
| | |\
| | | * Fix breakage from giflib updateMatt Sarett2015-08-241-2/+2
| | |/
* | | am 4f54368f: am 8d069cf9: Merge "Camera2: Support waitForSurfacePrepared in B...Yin-Chia Yeh2015-06-091-1/+53
|\| |
| * | am 8d069cf9: Merge "Camera2: Support waitForSurfacePrepared in BlockingSessio...Yin-Chia Yeh2015-06-091-1/+53
| |\ \
| | * \ Merge "Camera2: Support waitForSurfacePrepared in BlockingSessionCallback" in...stable/cm-13.0-ZNH2KBYin-Chia Yeh2015-06-091-1/+53
| | |\ \
| | | * | Camera2: Support waitForSurfacePrepared in BlockingSessionCallbackYin-Chia Yeh2015-06-051-1/+53
* | | | | am 037f27e3: resolved conflicts for merge of 9c9958ca to mnc-dev-plus-aospAndrew Lee2015-06-0235-4198/+0
|\| | | |
| * | | | resolved conflicts for merge of 9c9958ca to mnc-dev-plus-aospAndrew Lee2015-06-0235-4198/+0
| |\| | |
| | * | | Remove variable-speed library.Andrew Lee2015-06-0135-4209/+0
| | |/ /
* | | | am c8c2dec0: am 51527497: Merge "Add setCircularMaskEnabled"Chris Craik2015-05-291-2/+41
|\| | |
| * | | am 51527497: Merge "Add setCircularMaskEnabled"Chris Craik2015-05-291-2/+41
| |\ \ \ | | | |/ | | |/|
| | * | Merge "Add setCircularMaskEnabled"Chris Craik2015-05-291-2/+41
| | |\ \
| | | * | Add setCircularMaskEnabledChris Craik2015-05-291-2/+41
| | |/ /
* | | | am 7492d060: am 47acc4b4: Merge "Use try-with-resources instead of Closeables...Paul Duffin2015-05-221-10/+2
|\| | |
| * | | am 47acc4b4: Merge "Use try-with-resources instead of Closeables.closeQuietly...Paul Duffin2015-05-221-10/+2
| |\| |
| | * | Merge "Use try-with-resources instead of Closeables.closeQuietly(Closeable)"Paul Duffin2015-05-221-10/+2
| | |\ \
| | | * | Use try-with-resources instead of Closeables.closeQuietly(Closeable)Paul Duffin2015-05-221-10/+2
* | | | | am 56f9fe09: am b8ba8dbc: Merge "Include the frameworks/ex/variablespeed/test...Paul Duffin2015-05-221-5/+2
|\| | | |
| * | | | am b8ba8dbc: Merge "Include the frameworks/ex/variablespeed/tests/Android.mk ...Paul Duffin2015-05-221-5/+2
| |\| | |
| | * | | Merge "Include the frameworks/ex/variablespeed/tests/Android.mk file"Paul Duffin2015-05-221-5/+2
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Include the frameworks/ex/variablespeed/tests/Android.mk filePaul Duffin2015-05-211-5/+2
| | |/ /
* | | | am 49640ea5: am 55882370: Merge "Move min framerate behavior to Java"Chris Craik2015-05-142-10/+13
|\| | |
| * | | am 55882370: Merge "Move min framerate behavior to Java"Chris Craik2015-05-142-10/+13
| |\| | | | |/ | |/|
| | * Merge "Move min framerate behavior to Java"Chris Craik2015-05-142-10/+13
| | |\
| | | * Move min framerate behavior to JavaChris Craik2015-05-142-10/+13
| | |/
* | | am ebb6c511: Camera2: Support onSurfacePrepared in BlockingSessionCallbackEino-Ville Talvala2015-05-131-0/+11
|\| |
| * | Camera2: Support onSurfacePrepared in BlockingSessionCallbackEino-Ville Talvala2015-05-131-0/+11
* | | am 046ba28a: (-s ours) DO NOT MERGE: Minor style fixes.Jiawen Chen2015-04-290-0/+0
|\| |
| * | DO NOT MERGE: Minor style fixes.Jiawen Chen2015-04-295-25/+41
* | | Merge "Minor style fixes."Jiawen Chen2015-04-295-25/+41
|\ \ \ | |/ / |/| |
| * | Minor style fixes.Jiawen Chen2015-04-285-25/+41
* | | am 20df46ed: am 3ed91a81: Merge "Fix race in bitmap decode vs release."Chris Craik2015-04-231-20/+39
|\ \ \
| * \ \ am 3ed91a81: Merge "Fix race in bitmap decode vs release."Chris Craik2015-04-231-20/+39
| |\ \ \ | | | |/ | | |/|
| | * | Merge "Fix race in bitmap decode vs release."Chris Craik2015-04-231-20/+39
| | |\ \
| | | * | Fix race in bitmap decode vs release.Chris Craik2015-04-231-20/+39
| | |/ /
* | | / am 47098ae3: am 33817eae: Merge "Simplify destruction path - require users to...Chris Craik2015-04-201-3/+1
|\| | | | |_|/ |/| |
| * | am 33817eae: Merge "Simplify destruction path - require users to call destroy()"Chris Craik2015-04-201-3/+1
| |\|
| | * Merge "Simplify destruction path - require users to call destroy()"Chris Craik2015-04-201-3/+1
| | |\
| | | * Simplify destruction path - require users to call destroy()Chris Craik2015-01-291-6/+1
* | | | Merge "Fix StaleDataException in isPartitionEmpty"Jay Shrauner2015-04-031-1/+1
|\ \ \ \
| * | | | Fix StaleDataException in isPartitionEmptyJay Shrauner2015-04-021-1/+1
* | | | | am 315c8a38: am d90222ba: Merge "Adding Bytebuffer support to rastermill libr...Chris Craik2015-04-0312-30/+149
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-23 11:27:06 +0000