tree b4f24b881045b578cf0eeec77d388a3febaf7923
parent b6fc50bc39198ed6ea94a6ffd8a34e4c9435cad2
parent 20a5244345ea56374c45ae3eb2a7c86c507ea613
author Julia Reynolds <juliacr@google.com> 1505461110 +0000
committer android-build-merger <android-build-merger@google.com> 1505461110 +0000

Merge "Merge "Clear calling identity" into oc-mr1-dev am: bc0c5882c6" into oc-mr1-dev-plus-aosp
am: 20a5244345

Change-Id: Ibfd85e6b9d840618f0d9f03d01abe124dd4f746d