tree 3f3951cc4b990356cb35c4edc4553d4c2b83e286
parent 448080dcbc771c71623b4a360fb4b51ecddfb973
parent cf8ae79ef28b8e25ab67638ee1c86abe6bf06c6b
author Stuart Scott <stuartscott@google.com> 1422497615 +0000
committer android-build-merger <android-build-merger@google.com> 1422497615 +0000

am 8d702000: Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev automerge: f4e5236
automerge: cf8ae79

* commit 'cf8ae79ef28b8e25ab67638ee1c86abe6bf06c6b':
  Change getDeviceId to take phoneId.