tree 4ce7d0f114b58a00c956826142c48348f401502d
parent 64dd0a55edba5ad4cb39c435c8b38b60680736ab
parent 5aaa669beb3adefb167012ee6b66e476c8441723
author Dan Willemsen <dwillemsen@google.com> 1442692359 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442692359 +0000

am 5aaa669b: Merge remote-tracking branch \'aosp/upstream\'

* commit '5aaa669beb3adefb167012ee6b66e476c8441723':
  Add a test runner
  Fix bugs related to local vs. inherited variables