tree 43eb1ae12db1f34443b0d19dec33c556668fc36d
parent e0b5a3812269228070dabb792bc501ae435338bb
parent d456ec4be1d2310c498dda2c7319562754ad643e
author Stuart Scott <stuartscott@google.com> 1422496546 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1422496547 +0000

Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev