tree bc594c385fc8433bf2f293b45e716003db17cdc9
parent e4bc301aa50071d09d268f661be72647a491a8c0
parent 750668f5abd9813bea6f33cb84d941ae306afea8
author Christopher Ferris <cferris@google.com> 1385050199 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1385050199 -0800

am 750668f5: am 862faa12: Merge "Pull in cleaned version.h header."

* commit '750668f5abd9813bea6f33cb84d941ae306afea8':
  Pull in cleaned version.h header.