tree 4c46213426e2222f064c25c2d4d46a8163f84db9
parent 540004905a555087e72691aad4479aa52ab5460e
parent 84add1de6d0964d675542af2a70f7f67e5da556a
author Adam Cohen <adamcohen@google.com> 1381794190 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1381794191 +0000

Merge "Fix issue where custom content pops in (issue 11209357)" into jb-ub-now-indigo-rose