| commit | 397aca12c9d5ffaddab0fc70a05b8cb443f04a75 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Fri Jul 27 18:19:17 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 27 18:19:17 2012 -0700 |
| tree | e4f9dd7781fab7bffe71293ca1b0ee97e87cfe7d | |
| parent | a5ad76657da1d3616e3f4c6d341bd07a6bbf8025 [diff] | |
| parent | 722565a67dcd744e303deebc2e14cdeb447e73d7 [diff] |
am 722565a6: Merge "Fix inconsistency in user activity types." into jb-mr1-dev * commit '722565a67dcd744e303deebc2e14cdeb447e73d7': Fix inconsistency in user activity types.