tree 4881c83766945bb6c0ca85250096b15f503e6f48
parent 199e045cf10db380561655454b6371afc2ed45d5
parent d5958661c524f7023b8796eee28117d333f838b1
author Bart Sears <bsears@google.com> 1431496123 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431496123 +0000

am d5958661: (-s ours) am 0ed694f3: DO NOT MERGE - Change PLATFORM_VERSION from MNC to M

* commit 'd5958661c524f7023b8796eee28117d333f838b1':
  DO NOT MERGE - Change PLATFORM_VERSION from MNC to M