tree dac6029d2794980639c87c33d7614171f88dc27d
parent b6c156fe19394c43c96a98c1fbb1fa4cfa5a91a6
parent 36f82a32a644e3c06e16283d33b9a74cac1935d8
author Adam Cohen <adamcohen@google.com> 1407472636 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1407472636 +0000

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

* commit '36f82a32a644e3c06e16283d33b9a74cac1935d8':
  Fix screen issues with externally added items