tree 0029a469e4730e08bdcb82eb932dca1d946bbd47
parent 0ae35a8a26be0c2be53e5d149aead4d5d32ad07f
parent f0f5eee8238284aad08fd573959392542e57a8ab
author Sanket Padawe <sanketpadawe@google.com> 1421798092 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421798092 +0000

am f0f5eee8: Merge "Fixed a crash in TelephonyManager while calling getDeviceID()" into lmp-mr1-dev automerge: e54e760 automerge: 76e9d18

* commit 'f0f5eee8238284aad08fd573959392542e57a8ab':
  Fixed a crash in TelephonyManager while calling getDeviceID()