summaryrefslogtreecommitdiffstats
path: root/cmds/settings/src/com/android
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-10-24 18:04:27 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-24 18:04:27 -0700
commita699c1b16f9732308a5c17260607db1b7690d394 (patch)
treecc76f48f1031ed1fde5a380c572f797eb804823f /cmds/settings/src/com/android
parent829e001546a96a63b7a742b3dfa1bfa6c592029e (diff)
parent72d0a5aa04f18af5037ff331c2f0983f7cbd4331 (diff)
downloadframeworks_base-a699c1b16f9732308a5c17260607db1b7690d394.zip
frameworks_base-a699c1b16f9732308a5c17260607db1b7690d394.tar.gz
frameworks_base-a699c1b16f9732308a5c17260607db1b7690d394.tar.bz2
am 72d0a5aa: am ead7d90e: Merge "Fix issue #7408647: Add getUserCount() API" into jb-mr1-dev
* commit '72d0a5aa04f18af5037ff331c2f0983f7cbd4331': Fix issue #7408647: Add getUserCount() API
Diffstat (limited to 'cmds/settings/src/com/android')
0 files changed, 0 insertions, 0 deletions