tree eb04f23798214679c2ab5399c9998f3df7539a33
parent b4a83f15b651f1e75138fe6ff44a14ebb572155e
parent 7b5c395e9a50f988ca2275a429df17b6abbcc475
author Calin Juravle <calin@google.com> 1444128752 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444128752 +0000

am 7b5c395e: Merge "Fix style issue in stub_test."

* commit '7b5c395e9a50f988ca2275a429df17b6abbcc475':
  Fix style issue in stub_test.