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

* commit '6faa3acaad130533a4d597938fc15b04988a02b2':
  Camera2: LEGACY: Support prepare(), sort of.

2015-04-30 18:24:25 +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

am 8310f87d: Merge "ActionBar SearchView\'s default hint shouldn\'t override SearchableInfo" into mnc-dev

2015-04-30 16:07:36 +00:00

tests

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

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