tree 8f90d3707f56745e7f44e30389991662cbe43269
parent f96cb59c163607103e84b217e724e29057d1a3b7
parent b828fa2bfc1f31ab1f7282b09846cfa260e017cd
author Cassie Han <xih@google.com> 1516786649 +0000
committer android-build-merger <android-build-merger@google.com> 1516786649 +0000

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

Change-Id: I086a958cab93dcbc47103e5d0c7d91dba5aab412