tree 4344b0f32c9f1cbfc1c7b9bc38be5f65c3948d15
parent 106b6f0a2a1a23925f276c3b8e0551f31baa9a99
parent cd4af2b5a6024258cc47bcea29adf7e1502097bf
author Adam Cohen <adamcohen@google.com> 1395355196 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395355196 +0000

am cd4af2b5: am 36a62885: Merge "Adding in-activity intro screen (issue 12905636)" into ub-now-mister-ugly

* commit 'cd4af2b5a6024258cc47bcea29adf7e1502097bf':
  Adding in-activity intro screen (issue 12905636)