tree f8af86e7c2644cc7796f30010b504ea644e216ff
parent 712205bac075dc59a1ccd79a860d553ba31402f0
parent 267cb88f4d4adb2cdddd9b29eb8fce7104507114
author Christopher Wiley <wiley@google.com> 1441131619 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441131619 +0000

am 267cb88f: Merge "Set up aidl for gtest"

* commit '267cb88f4d4adb2cdddd9b29eb8fce7104507114':
  Set up aidl for gtest