tree ef61a3ec4b319ee16918b909efc2d6863985f309
parent 7c9101b74ce947bbd1a97f4868929226ac7f9939
parent fe8afb42241a2e2bf4dca411d54c4ff52a9e1be1
author Yuichi Araki <yaraki@google.com> 1434512707 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434512707 +0000

am fe8afb42: am d816ff3c: Camera2Basic: Several fixes

* commit 'fe8afb42241a2e2bf4dca411d54c4ff52a9e1be1':
  Camera2Basic: Several fixes