tree c916f9c82c17ec8cefc3904dcae89041a324e300
parent 20bd2c10c1d5ead86f472a7397f060159693e4f4
parent 36bde9a9e50412329237081e595d732b7da93e0b
author Adam Cohen <adamcohen@google.com> 1442622957 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442622957 +0000

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

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