tree 9ca9ccc6a7dcd6f1ec5f8da0835c2ab329e403a0
parent 82edd1723061585f75fec38eb14ec5a8d0df7ac1
parent a21dd542fb9129a36d94aef1370ba71d4f82ca7e
author Dan Albert <danalbert@google.com> 1446686834 +0000
committer android-build-merger <android-build-merger@google.com> 1446686834 +0000

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

* commit 'a21dd542fb9129a36d94aef1370ba71d4f82ca7e':
  Rename android-M to android-23.