tree 9f1d7204b46f17c9461507c6edf2981eea01e8ea
parent 9ebb1aeb994dbb149676bb24244630ee8ccb9b69
parent 740e5da0624f8ede5a8ddaa20bfdbb2bd1cfa13a
author Robert Greenwalt <rgreenwalt@google.com> 1450472342 +0000
committer android-build-merger <android-build-merger@google.com> 1450472342 +0000

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

* commit '740e5da0624f8ede5a8ddaa20bfdbb2bd1cfa13a':
  Check permissions on getDeviceId.