tree ea86fd5d37c997af21fbabd8eb746d3e6a9a87ff
parent 7f59bed9abf0a9ea67b348fc09075849ce5b3611
parent 432478a97cc54a362fb56016a5b089af1e353211
author Feng Yu <feny@google.com> 1487225384 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1487225385 +0000

Merge "CameraBase: Don't return an sp<> by reference" into security-aosp-mnc-mr1-release