Eino-Ville Talvala 6faa3acaad Merge "Camera2: LEGACY: Support prepare(), sort of." into mnc-dev

2015-04-30 18:10:31 +00:00

..

java

Merge "Camera2: LEGACY: Support prepare(), sort of." into mnc-dev

2015-04-30 18:10:31 +00:00

jni

Merge "am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp" into mnc-dev

2015-04-30 17:53:51 +00:00

res

Merge "ActionBar SearchView's default hint shouldn't override SearchableInfo" into mnc-dev

2015-04-30 15:59:21 +00:00

tests

am a4edc82e: am 4547dac0: Fix one-off error in reporting.

2015-04-28 21:09:13 +00:00