tree ec03eb7b8abc62dca27dd9ac1b7629a7187cf07f
parent 3e4cef5f1530fb32859220ca0471cb873f76abfe
parent b55ce801c3c57e74307d4bc41ba8d95fe333259d
author Igor Murashkin <iam@google.com> 1409344389 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409344389 +0000

am b55ce801: am 4c733ef8: Merge "camera2: Remove obsolete CameraCharacteristicsTest" into lmp-dev

* commit 'b55ce801c3c57e74307d4bc41ba8d95fe333259d':
  camera2: Remove obsolete CameraCharacteristicsTest