tree e4f9dd7781fab7bffe71293ca1b0ee97e87cfe7d
parent 6089a88ca54cd18c7f598185389dd2fd1b36114c
parent df693de4fe12f081555b449e2726e205fbd86572
author Jeff Brown <jeffbrown@google.com> 1343438247 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1343438248 -0700

Merge "Fix inconsistency in user activity types." into jb-mr1-dev