tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent f309204cda5a7461b8fb62af48b09f44047310ea
parent 905766591d30f6dacc325d37a4d098a05a49f6e1
author Adam Cohen <adamcohen@google.com> 1422669662 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669662 +0000

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

* commit '905766591d30f6dacc325d37a4d098a05a49f6e1':