tree cd0d5eb4eb4aee1e639f92625331c78013059daf
parent ad4a285af619ea29f79dbe4da19061c49f24a8c9
parent b4db7923818393c5c839dba0d43bec36da98759c
author Narayan Kamath <narayan@google.com> 1436871907 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436871907 +0000

am b4db7923: Merge "Delete some obsolete test code."

* commit 'b4db7923818393c5c839dba0d43bec36da98759c':
  Delete some obsolete test code.