tree 2ec581f6d8c71c93a45b26f6d2f848035ea715b7
parent 45f3ed05c98d4e9cfc7b70a8c5f3af510afea8ee
parent 688701990db1aef2d7dbe0ccdc4f12c2dd5f51a8
author Christopher Ferris <cferris@google.com> 1389662653 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389662653 -0800

am 68870199: Merge "Next phase of the move, reformat use C++ features."

* commit '688701990db1aef2d7dbe0ccdc4f12c2dd5f51a8':
  Next phase of the move, reformat use C++ features.