tree 5ae80455aab8313e16b3ffb7df86683fb0509656
parent 44ef19d1319158f144c151843c5d88ee86254ea3
parent f301dab4711cef811bbfb032b84aa2daa6bc1c3c
author Jack Yu <jackyu@google.com> 1490374978 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1490374979 +0000

Merge "Deprecated getDeviceId and added getMeid and getImei"