tree 64d2760ebbe80aea1de8f5b86277673d75fc94a8
parent 896ee5b6f8354567464a371025088156ed49bc32
parent 282a7e1b1db121c910f25b13081242a8c7611708
author Ian Rogers <irogers@google.com> 1366743865 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366743865 -0700

am 282a7e1b: Adding matching @deprecated.

* commit '282a7e1b1db121c910f25b13081242a8c7611708':
  Adding matching @deprecated.