tree 13b2d58fa1e7b1392eb17495b10f617e69addca1
parent 385da6e4337e5ec4e459f8e98dcc658a67b4f354
parent 8ab0d48a61987446c782d2d5816c522b2768adc6
author Dake Gu <dake@google.com> 1443733885 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443733885 +0000

am 8ab0d48a: Merge "Showcase: Update SDK to 23 and support lib to 23.0.1" into mnc-ub-dev

* commit '8ab0d48a61987446c782d2d5816c522b2768adc6':
  Showcase: Update SDK to 23 and support lib to 23.0.1