am 38de1548: am 45e1e1ec: (-s ours) am 83a25842: Merge "Lose some deprecated test annotations."

* commit '38de1548c9c43a9777bcfd50cc552753f98aa87c':
This commit is contained in:
Narayan Kamath
2015-08-27 20:16:53 +00:00
committed by Android Git Automerger

Diff Content Not Available