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)
commitafd74af095e36e2af07338870c144a04446d3fa9
treea33bb33bdc3caef08fb0754a449dea626cfc5f98
parent647e34a0735aa4ca17db261da079f63f7d62956d
parent56f83527aebc2254338926532086ac1a168d2872
Merge "Merge "Passing callingUid to internal methods" into oc-dev am: dacdf2e978 am: de066fd249" into oc-dr1-dev-plus-aosp
am: 56f83527ae

Change-Id: I06d1dec5693658716d7ade11b93a1ae419111594