tree 3b7cf106523102febcb47315799e2e4210bf234b
parent 6ec89da16e983d7e879d530098c8cac0b757fd49
parent b325345ef0adf2849350d339de1ec5f92b67b7ae
author Alan Viverette <alanv@google.com> 1396477139 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396477139 +0000

am b325345e: Merge "Switch framework Holo references to Quantum.Light"

* commit 'b325345ef0adf2849350d339de1ec5f92b67b7ae':
  Switch framework Holo references to Quantum.Light