tree f765a33434c385d1bac1d1fa5fdaa1ec2136c0b4
parent d896c195123716fb04ab6718e77fe0e5d1ab2bb9
parent 1f71e465ef1544a2962299445dee03e6856ea54a
author Christopher Ferris <cferris@google.com> 1389662786 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389662786 +0000

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

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