tree 8c99eea97e3e6ad5c02db7c8721acbb786bc1cbb
parent 5b5b1f9b48f966942be3cda8d4ecfb7d910f12a0
parent 50fae736dc0a5552e9e14d8e8358449aa0f7536a
author Christopher Ferris <cferris@google.com> 1389662937 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389662937 +0000

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

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