tree 9a45559bf5dde0b77d162ffdbc3e50369c8cc9d0
parent 5d7bb383b85aeaa60abeb6e3ad7ba854d6c40b37
parent a652b7161d3069ba9b5650f1caf741d2588de141
author Robert Greenwalt <rgreenwalt@google.com> 1450393751 +0000
committer android-build-merger <android-build-merger@google.com> 1450393751 +0000

Merge "Check permissions on getDeviceId." into mnc-dev am: 4557ef32fe am: 628b8f1f5f
am: a652b7161d

* commit 'a652b7161d3069ba9b5650f1caf741d2588de141':
  Check permissions on getDeviceId.