tree 75d212dd557faca699646f2b679c42832bb90eef
parent 23807100f68b1aa26a2a0ca55ac741e5def85079
parent 55a1c5d795cb590c1350a5b880829bf4290757d9
author Dan Albert <danalbert@google.com> 1446687042 +0000
committer android-build-merger <android-build-merger@google.com> 1446687042 +0000

Merge "Rename android-M to android-23." am: a21dd542fb
am: 55a1c5d795

* commit '55a1c5d795cb590c1350a5b880829bf4290757d9':
  Rename android-M to android-23.