| commit | 1fd1d493c90360fcc814c581bb91eb75a2a9f932 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Fri Jul 27 18:21:37 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 27 18:21:37 2012 -0700 |
| tree | 05db265bd75e2a17316cda2ef2e62c1a40db6ef2 | |
| parent | 0cdb1e7376f98d66a6133845fbe31bae94b22793 [diff] | |
| parent | 397aca12c9d5ffaddab0fc70a05b8cb443f04a75 [diff] |
am 397aca12: am 722565a6: Merge "Fix inconsistency in user activity types." into jb-mr1-dev * commit '397aca12c9d5ffaddab0fc70a05b8cb443f04a75': Fix inconsistency in user activity types.