tree d7c8bc9db429801fe011f564dac986a967507387
parent 09b77fbb92080f8eaae37c8fb2c8b72da1006be2
parent d373dd015485fbc2a306471bfcf7b093d3ca649b
author Eino-Ville Talvala <etalvala@google.com> 1486083346 +0000
committer android-build-merger <android-build-merger@google.com> 1486083346 +0000

Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96 am: 4fca12e56f am: f0009384d8 am: 7a14d95270 am: 888f5bab6d am: a6b1816e16 am: 06f46cabd0 am: 31670090bf am: e1b8152064 am: dd062f9882
am: d373dd0154

Change-Id: I32d94d35ac07c96eb81a8b47e67b53b81fadaf6d