Sanket Padawe 81f63a60f3 am 60e4edfb: am 5df10e18: Merge "Suppress logging to avoid showing phone no." into lmp-mr1-dev ...

automerge: f19485b

* commit 'f19485b644b7ba7bda1f5c7a2279ca56c37923f0':
  Suppress logging to avoid showing phone no.

2015-01-29 21:57:29 +00:00

..

android/telephony

am 60e4edfb: am 5df10e18: Merge "Suppress logging to avoid showing phone no." into lmp-mr1-dev

2015-01-29 21:57:29 +00:00

com/android

Change getDeviceId to take phoneId.

2015-01-28 13:06:12 -08:00