OSDN Git Service

Merge "Camera: ensure lock ordering (device->session)" into nyc-mr1-dev
authorYin-Chia Yeh <yinchiayeh@google.com>
Thu, 11 Aug 2016 00:32:13 +0000 (00:32 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 11 Aug 2016 00:32:15 +0000 (00:32 +0000)

Trivial merge