| commit | 49f10e08e5abd188fd67e231353ed9168cb6acae | [log] [tgz] |
|---|---|---|
| author | Adam Cohen <adamcohen@google.com> | Wed Oct 29 07:04:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:04:38 2014 +0000 |
| tree | 10da860fcff71886af91d082e31f0e1917926848 | |
| parent | b409938696097fd2f82b7e4a0ed76034cd8f40a2 [diff] | |
| parent | e68cc516eebeab58d2c76c0d612490cab2f1b287 [diff] |
am e68cc516: 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 'e68cc516eebeab58d2c76c0d612490cab2f1b287':