tree 16b93a604292eda405f2d25d037f905c1ff12ab3
parent 4ab2d8d734cafe4942c006544558266d4e55340c
parent ac45eb3dfa7347f7b8c98be1111b2a5f9e344c46
author Eino-Ville Talvala <etalvala@google.com> 1339173099 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1339173099 -0700

Merge changes I82c9811c,Id0294300

* changes:
  Camera2: Add basic concurrency guards.
  Camera2: Add internal parameter state to dump.