OSDN Git Service

am 45e1e1ec: (-s ours) am 83a25842: Merge "Lose some deprecated test annotations."
authorNarayan Kamath <narayan@google.com>
Thu, 27 Aug 2015 11:32:13 +0000 (11:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:32:13 +0000 (11:32 +0000)
commit38de1548c9c43a9777bcfd50cc552753f98aa87c
tree7f84c40aaa75cd61f165f55c1ed04452351a1edd
parent8b126014ac7e0eefd9e7f62dfd1ac0528772e23e
parent45e1e1ec928b236db0194b304361735fd93161ef
am 45e1e1ec: (-s ours) am 83a25842: Merge "Lose some deprecated test annotations."

* commit '45e1e1ec928b236db0194b304361735fd93161ef':