OSDN Git Service

Merge "Merge "Passing callingUid to internal methods" into oc-dev am: dacdf2e978...
authorTodd Kennedy <toddke@google.com>
Thu, 8 Jun 2017 06:28:33 +0000 (06:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 8 Jun 2017 06:28:33 +0000 (06:28 +0000)
am: 56f83527ae

Change-Id: I06d1dec5693658716d7ade11b93a1ae419111594


Trivial merge