tree 10da860fcff71886af91d082e31f0e1917926848
parent c000a50baaf7d31b4fcf0d83e3b70b1a546876e2
parent 382d8606869c777fedc570494dfe6a698e5a1edd
author Adam Cohen <adamcohen@google.com> 1422666442 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666442 +0000

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

* commit '382d8606869c777fedc570494dfe6a698e5a1edd':