tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 0f72149abd3849418d6d3b28cb93a625c984cacf
parent 55bd525f309fc5d9f77373358ff4fbcd9a092ffb
author Adam Cohen <adamcohen@google.com> 1422685275 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685275 +0000

am 55bd525f: am 90576659: am 382d8606: am 36f82a32: Merge "Fix screen issues with externally added items" into ub-now-porkchop

* commit '55bd525f309fc5d9f77373358ff4fbcd9a092ffb':