tree 32a1c917de89b967b092742b68b9f8bb2c2f544d
parent 12d282736fae91cc147bc8120ac781d2acf854d3
parent ed10c013bd6f6775cd6bb834283303deed55daa7
author Adam Cohen <adamcohen@google.com> 1442624216 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442624216 +0000

am ed10c013: am 36bde9a9: Merge "Add fake CustomContent screen for testing Launcher interface" into ub-launcher3-burnaby

* commit 'ed10c013bd6f6775cd6bb834283303deed55daa7':
  Add fake CustomContent screen for testing Launcher interface