OSDN Git Service

Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96...
authorEino-Ville Talvala <etalvala@google.com>
Fri, 3 Feb 2017 00:58:44 +0000 (00:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 00:58:44 +0000 (00:58 +0000)
am: a6e6e7c5da

Change-Id: I1f95aa6f6b4ba80277aa9b00c72ba3f52bbb2dac


Trivial merge