OSDN Git Service

Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev
authorStuart Scott <stuartscott@google.com>
Thu, 29 Jan 2015 01:55:46 +0000 (01:55 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 29 Jan 2015 01:55:47 +0000 (01:55 +0000)
commitf4e52360613d20dc8176ce8a37cb05ad904fad0d
tree43eb1ae12db1f34443b0d19dec33c556668fc36d
parente0b5a3812269228070dabb792bc501ae435338bb
parentd456ec4be1d2310c498dda2c7319562754ad643e
Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev
telephony/java/android/telephony/TelephonyManager.java