tree 5e7e22e4be30af3979c372f4efbaa48a58779020
parent 50843b1708f7662f9be661001125d91e0ef544d7
parent c99c41781c69d2cfef411c531cf879e84ca62a74
author Robert Greenwalt <rgreenwalt@google.com> 1450394109 -0800
committer android-build-merger <android-build-merger@google.com> 1450394109 -0800

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

* commit 'c99c41781c69d2cfef411c531cf879e84ca62a74':
  Check permissions on getDeviceId.