tree d2dc4871514390f2d7ba38400645b0b448988d82
parent 3d419cf1d9aa7eba588b800111550d4ac40f1d53
parent d370feffd6b9f0d8df8f222d9c22dd32cce5532b
author Dan Willemsen <dwillemsen@google.com> 1450743552 -0800
committer android-build-merger <android-build-merger@google.com> 1450743552 -0800

Merge "Remove extra cc_test options" am: b34755199f
am: d370feffd6

* commit 'd370feffd6b9f0d8df8f222d9c22dd32cce5532b':
  Remove extra cc_test options