summaryrefslogtreecommitdiffstats
path: root/core/java/android/accounts
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2012-09-17 11:29:28 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-09-17 11:29:28 -0700
commit0db31ec77d941499953ec0fa639e6115d4dc6ec1 (patch)
treefad35fcdfde9bf02a865522d1868ba09fd451b60 /core/java/android/accounts
parent7f52de24d65b3c4f3199f0fd88e1e26376d6c9d1 (diff)
parent3e4ef8e22010f2ede5d822ce3aaa07254079e123 (diff)
downloadframeworks_base-0db31ec77d941499953ec0fa639e6115d4dc6ec1.zip
frameworks_base-0db31ec77d941499953ec0fa639e6115d4dc6ec1.tar.gz
frameworks_base-0db31ec77d941499953ec0fa639e6115d4dc6ec1.tar.bz2
am 3e4ef8e2: am a87826c3: Merge "Fix face unlock for multiple users" into jb-mr1-dev
* commit '3e4ef8e22010f2ede5d822ce3aaa07254079e123': Fix face unlock for multiple users
Diffstat (limited to 'core/java/android/accounts')
0 files changed, 0 insertions, 0 deletions