commit | 55fe3ba9823f8e2cbc32799204e8f3e6bdeb8eda | [log] [tgz] |
---|---|---|
author | Doug Zongker <dougz@android.com> | Tue Aug 24 14:41:28 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 24 14:41:28 2010 -0700 |
tree | f74891a7e85c7c321dfc96f1a556c8a6fac3aada | |
parent | e4890e55cc214584096d17f5624fc4574f6b83f1 [diff] | |
parent | feb81e9679e98460efe46fc578617ef0c6b85c14 [diff] |
am feb81e96: allow TelephonyManager.getDeviceId to return an ESN instead of an MEID Merge commit 'feb81e9679e98460efe46fc578617ef0c6b85c14' into gingerbread * commit 'feb81e9679e98460efe46fc578617ef0c6b85c14': allow TelephonyManager.getDeviceId to return an ESN instead of an MEID