commit | f0009384d8fe38a08187f6d9fb0e4b37d0619a10 | [log] [tgz] |
---|---|---|
author | Eino-Ville Talvala <etalvala@google.com> | Thu Feb 02 23:49:04 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Feb 02 23:49:04 2017 +0000 |
tree | ea70dd4b952c548b27325b4a1b7e5d1160a1a7f0 | |
parent | 8806c2a11dd6e810aeed8b65eeac76fba7c94b94 [diff] | |
parent | 4fca12e56f35131c8cde1dc54e8d0733610554d4 [diff] |
Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96 am: 4fca12e56f Change-Id: I082c1ec76a3b05de211d169ee07a7a1f544081dc