tree 258f3896dd7f1b6b8c58062f6167098f49e0aa6d
parent cb0c5a9f5e2deb1e792ef971fe0678a6986669e8
parent fe4e620e75007499c1cf47e2e254a8a30763dbe0
author Stephen Hines <srhines@google.com> 1390005811 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1390005811 +0000

am fe4e620e: am 42bd2faa: am 9ae07379: Merge "Fix C++ tests to work with NDK build."

* commit 'fe4e620e75007499c1cf47e2e254a8a30763dbe0':
  Fix C++ tests to work with NDK build.