tree f91d3e60d73e69ca3782c62cef286e6dcea4acce
parent c9fca90f4fb44887bde4c2e3671dc0db21c0d6e8
parent 969016a37c7f7894d110c6855b2cc364bb37690b
author Dianne Hackborn <hackbod@google.com> 1438448614 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438448614 +0000

am 969016a3: am f4dbf25a: am 4b4244cb: am 56866c4d: Merge "Remove M codename, version number is 6.0." into mnc-dev

* commit '969016a37c7f7894d110c6855b2cc364bb37690b':
  Remove M codename, version number is 6.0.