tree 3233d8f66202e92d318127e89ba9ee5f0184c7d6
parent 751aa7c9361a2b965f00d17eba5acf78b6c8f52e
parent c3db771cac9a2d448f4f624ac410377c30fc6158
author Dianne Hackborn <hackbod@google.com> 1435366692 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435366692 +0000

am c3db771c: am 578a9efd: Merge "Raise API level to 23." into mnc-dev

* commit 'c3db771cac9a2d448f4f624ac410377c30fc6158':
  Raise API level to 23.