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:54:35 +0000 (23:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 2 Feb 2017 23:54:35 +0000 (23:54 +0000)
commit888f5bab6db31e56fca6ad8852378cb49c963f13
tree2cc5991c6416f19d0e229c486126aef3a4f8525c
parentdd82ab237742b5594f19ac41e0b89ed7e37f007e
parent7a14d95270c4824762c4d4be0d99f5a391e6b82d
Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96 am: 4fca12e56f am: f0009384d8
am: 7a14d95270

Change-Id: I42cf5ca9442728273ff2d90095b6d1520c75762a