tree 4344b0f32c9f1cbfc1c7b9bc38be5f65c3948d15
parent bba150b6fc733847a04014abb22624c2c9456025
parent 36a6288545060415189803f24bb6252b98e071e3
author Adam Cohen <adamcohen@google.com> 1395355058 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395355058 +0000

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

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