tree f9e480cf0fa17a8dc7abd0577df1190820c42443
parent 56ce726019f700a95ce5b45beebceadae4836e30
parent f1e98d857ec377f2c9b916073d40732e6ebb7ced
author Eino-Ville Talvala <etalvala@google.com> 1380825235 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1380825235 +0000

Merge "Camera API 2, Device 2/3: Implement idle and shutter callbacks" into klp-dev