| commit | eabe9de34fff39536373265c989f70623b9345e1 | [log] [tgz] |
|---|---|---|
| author | Doug Zongker <dougz@android.com> | Tue Aug 24 14:45:13 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 24 14:45:13 2010 -0700 |
| tree | 385f8d225f9208013b9e9c2f903d1b33bcd800d3 | |
| parent | 9abd25295b94b1a75619246644d5fa7929adbb65 [diff] | |
| parent | 55fe3ba9823f8e2cbc32799204e8f3e6bdeb8eda [diff] |
am 55fe3ba9: am feb81e96: allow TelephonyManager.getDeviceId to return an ESN instead of an MEID Merge commit '55fe3ba9823f8e2cbc32799204e8f3e6bdeb8eda' into gingerbread-plus-aosp * commit '55fe3ba9823f8e2cbc32799204e8f3e6bdeb8eda': allow TelephonyManager.getDeviceId to return an ESN instead of an MEID