Eino-Ville Talvala 12e9f69913 am 914970b4: am d38b1302: Merge "DO NOT MERGE: Hide new camera API." into klp-dev ...

* commit '914970b4735993df3246b02fd9a18b55f15ea8d4':
  DO NOT MERGE: Hide new camera API.

2013-10-12 18:56:23 -07:00

..

java

am 914970b4: am d38b1302: Merge "DO NOT MERGE: Hide new camera API." into klp-dev

2013-10-12 18:56:23 -07:00

jni

am d18920f5: am d9b09fa9: Merge "Fix registerListener and flush bugs." into klp-dev

2013-10-10 19:21:08 -07:00

res

am 2dbe1627: am 12ad9ce2: Merge "Fix spelling." into klp-dev

2013-10-11 14:36:59 -07:00

tests

…