tree cba62d0d64153aa2169651696bc238591341d679
parent e67e8292756d3decc3c9f921e86445868744e1f9
parent a573321674d00403e5d19f41f13dd6e3f639da0a
author Adam Cohen <adamcohen@google.com> 1414085278 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085278 +0000

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

* commit 'a573321674d00403e5d19f41f13dd6e3f639da0a':