OSDN Git Service

Merge "CameraManager: Handle camera service being disabled explicitly" into oc-dr1-dev
authorEino-Ville Talvala <etalvala@google.com>
Fri, 14 Jul 2017 05:49:45 +0000 (05:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Jul 2017 05:49:45 +0000 (05:49 +0000)
commit01d6fb2c9cf408c0451f7ee89faf2d5244dbfa6c
tree86ca67176559c91dd164b4e20521eaf69d9c2453
parent7e15c580852a1f18614396bc0f85f8e04d737d19
parent0c0fd0375c6efae3afcdd43a1b21b4c29cd93408
Merge "CameraManager: Handle camera service being disabled explicitly" into oc-dr1-dev
am: 0c0fd0375c

Change-Id: I1d67c1f2cdaa28063110454592cf7306ecb7bcd2