| commit | e68cc516eebeab58d2c76c0d612490cab2f1b287 | [log] [tgz] |
|---|---|---|
| author | Adam Cohen <adamcohen@google.com> | Thu Oct 23 17:29:12 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 17:29:12 2014 +0000 |
| tree | cba62d0d64153aa2169651696bc238591341d679 | |
| parent | c3fa14e78ab0d973b3bd2646bf5ed5aad860fcfb [diff] | |
| parent | 575937508171ed19bc943615e25d45efd21cbcbf [diff] |
am 57593750: am 95c925ae: am 91260602: am 6bef14bb: am 2456b973: Merge "Fix issue where custom content pops in (issue 11209357)" into jb-ub-now-indigo-rose * commit '575937508171ed19bc943615e25d45efd21cbcbf':