summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorxinhe <xinhe@google.com>2014-12-04 15:14:59 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-04 15:14:59 +0000
commit9a4472bf45044082f4fa6d906530f3640761676a (patch)
tree57e45450ab4236f6278a6b941fd8aaeb02db8fed /libs
parent0304c529b6a166547aaf104a46bc876780ba7416 (diff)
parent8f61e7549ebb7ccb6bc2d41c30a9f2da2fb9bd7c (diff)
downloadframeworks_base-9a4472bf45044082f4fa6d906530f3640761676a.zip
frameworks_base-9a4472bf45044082f4fa6d906530f3640761676a.tar.gz
frameworks_base-9a4472bf45044082f4fa6d906530f3640761676a.tar.bz2
am 8f61e754: Merge "Unable to unlock SIM with a PIN/PUK" into lmp-mr1-dev
* commit '8f61e7549ebb7ccb6bc2d41c30a9f2da2fb9bd7c': Unable to unlock SIM with a PIN/PUK
Diffstat (limited to 'libs')
0 files changed, 0 insertions, 0 deletions