tree 403950c0b8d7936bd3d45adeecc115165b0e1698
parent 0b00db8eebd3b677c1d9190061d0d97dd672976e
parent d24e4eafdb3e42de5a8fd080fcd50ebf4c7bcb71
author Fyodor Kupolov <fkupolov@google.com> 1434669402 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1434669421 +0000

Merge "OP_READ_PHONE_STATE AppOp check for getMergedSubscriberIds" into mnc-dev