tree 094cf7b46a673b4e2d6b3d796762de78900bad23
parent 714c8596adc1ad686ed9a9e99906d6217c02748f
parent e2b306e30e7ee47004390e7394cdb5a125068daf
author Polina Bondarenko <pbond@google.com> 1484589752 +0000
committer android-build-merger <android-build-merger@google.com> 1484589752 +0000

Merge "Make TelephonyManager.getImei a system APIs." am: dc61ad0ad8
am: e2b306e30e

Change-Id: Ida4807876ce741a211189e41e92383404b6a3a3c