Commits
Jeff Brown authored and Android Git Automerger committed 1fd1d493c90M
am 397aca12: am 722565a6: Merge "Fix inconsistency in user activity types." into jb-mr1-dev * commit '397aca12c9d5ffaddab0fc70a05b8cb443f04a75': Fix inconsistency in user activity types.
Showing diff to0cdb1e7376f