tree e27e6ecc8eadd77514411328e1dedeb6ebe68366
parent 84af3a7b2bcdf8483cea72286096c9c4c3791c75
parent eb9452a08def7c928a32eda3f4634f82448fa6ab
author Cassie Han <xih@google.com> 1516774019 +0000
committer android-build-merger <android-build-merger@google.com> 1516774019 +0000

Merge "Move android.provider.Telephony.SECRET_CODE to Telephony.Intents."
am: eb9452a08d

Change-Id: Iaa4e291d0926db9ddb8123a7ec72acf1e82c4d84