tree 22a8b207d70aed6fe8b79a223a2c5e8a9f898597
parent 109d4b0f2d805f105cbb2fdeb3808d6fa122a546
parent cb1e32ac2b5eb12ff89af5eb8074908b5f54d047
author William Bourke <billbourke@google.com> 1413584444 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413584444 +0000

am cb1e32ac: am 44d51545: am 7d5c68e3: am 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev

* commit 'cb1e32ac2b5eb12ff89af5eb8074908b5f54d047':
  Modified lollipop Easter egg for TV compatibility