summaryrefslogtreecommitdiffstats
path: root/packages/SettingsProvider/src/com/android/providers/settings
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2013-09-10 16:55:25 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-10 16:55:25 -0700
commit9993f8ff24718553c05872d9f13f4114701b3428 (patch)
tree18c25289a780dda1312a003b54c87a52e1d3178e /packages/SettingsProvider/src/com/android/providers/settings
parent2f38d460f38efc2cadc6dce0f924fa1523123200 (diff)
parentdc6fd0a20a095ac0fb544184d8a4258e80b4a14d (diff)
downloadframeworks_base-9993f8ff24718553c05872d9f13f4114701b3428.zip
frameworks_base-9993f8ff24718553c05872d9f13f4114701b3428.tar.gz
frameworks_base-9993f8ff24718553c05872d9f13f4114701b3428.tar.bz2
am dc6fd0a2: Merge "Propagate input ANR reason to activity manager log." into klp-dev
* commit 'dc6fd0a20a095ac0fb544184d8a4258e80b4a14d': Propagate input ANR reason to activity manager log.
Diffstat (limited to 'packages/SettingsProvider/src/com/android/providers/settings')
0 files changed, 0 insertions, 0 deletions