commit | 3a706894c4865a19b3245372c3902770cb67dca0 | [log] [tgz] |
---|---|---|
author | Eino-Ville Talvala <etalvala@google.com> | Thu Feb 02 23:49:06 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Feb 02 23:49:06 2017 +0000 |
tree | e95e671bfe9870850641b541989e5370d6da2ed0 | |
parent | 6cb19125052b31023b497b5e2f03f6963f4b48aa [diff] | |
parent | edac7f768aff27db7a30f83c4844b7a618030516 [diff] |
Merge "CameraBase: Don't return an sp<> by reference" into nyc-dev am: 41d3046edb am: edac7f768a Change-Id: If8f28651d98edfe3b193b88f96f9fc09741c0b88