tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 5b04db49d1074ac25c726a09901e872ec06c8fdf
parent 566ec2a109a072c1430d357f26bbc35053cf33c6
author Adam Cohen <adamcohen@google.com> 1392410173 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410173 +0000

am 566ec2a1: am 70e4cf1c: am 225ad9b7: Only show the most recent screen added to custom content (issue 11087978)

* commit '566ec2a109a072c1430d357f26bbc35053cf33c6':