OSDN Git Service

Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96...
authorEino-Ville Talvala <etalvala@google.com>
Thu, 2 Feb 2017 23:52:04 +0000 (23:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 2 Feb 2017 23:52:04 +0000 (23:52 +0000)
am: f0009384d8

Change-Id: I8efab658bd67af7eb85ac8cd6dc7d6d9fa61ef21


Trivial merge