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

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