tree 46f03fa8ace2e4d22fbcb523a5387e8ab0c14249
parent cefcd81bdb47ca3196fe487e684880d70ff8073c
author Stuart Scott <stuartscott@google.com> 1422477343 -0800
committer Stuart Scott <stuartscott@google.com> 1422479172 -0800

Change getDeviceId to take phoneId.

bug:18827144
Change-Id: I32196f842504e63f4ddd45401e83e73afae81ad5