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:39:28 +0000 (00:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 11 Aug 2016 00:39:28 +0000 (00:39 +0000)
commitffa443f431ff1b88a105a61df4d6611286275cb3
tree8c3a91f652dea456837ec97430f62fe2cab42cfa
parentde71f83c2ca0266c787f217a63cbabf20d3b459e
parent58b4623d1f6603945bba37baad9e61329519b8b2
Merge "Camera: ensure lock ordering (device->session)" into nyc-mr1-dev
am: 58b4623d1f

Change-Id: I8c92a36230ae4b838cd06f421fdf8359e9a8a966