OSDN Git Service

am 98115660: (-s ours) am d95a340b: Merge "Camera2 tests: Fix incorrect error code...
authorEino-Ville Talvala <etalvala@google.com>
Thu, 27 Aug 2015 11:28:01 +0000 (11:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:28:01 +0000 (11:28 +0000)
* commit '9811566033a95fa9b92c500372642d108f9f8564':


Trivial merge