summaryrefslogtreecommitdiffstats
path: root/packages/SettingsProvider
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2013-09-10 16:58:06 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-10 16:58:06 -0700
commit279f3cdf70652a211c54f7b70fb08722a50e6cec (patch)
tree9ae25e35bb0b140be6bfd920ef7f11cf544abfc7 /packages/SettingsProvider
parentd0d99a474bb4db25ac3062120f05678dab362cea (diff)
parent9993f8ff24718553c05872d9f13f4114701b3428 (diff)
downloadframeworks_base-279f3cdf70652a211c54f7b70fb08722a50e6cec.zip
frameworks_base-279f3cdf70652a211c54f7b70fb08722a50e6cec.tar.gz
frameworks_base-279f3cdf70652a211c54f7b70fb08722a50e6cec.tar.bz2
am 9993f8ff: am dc6fd0a2: Merge "Propagate input ANR reason to activity manager log." into klp-dev
* commit '9993f8ff24718553c05872d9f13f4114701b3428': Propagate input ANR reason to activity manager log.
Diffstat (limited to 'packages/SettingsProvider')
0 files changed, 0 insertions, 0 deletions