tree a16b236a2e4a5b44c5faae3d7ea20282c91cb62d
parent ff14d457c41a8b608ea743e6a04642912436d21e
parent 747cb3b515e1b01f6b61ec911b693d88d480eaaf
author Android (Google) Code Review <android-gerrit@google.com> 1249410184 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1249410184 -0700

am 747cb3b5: Merge change 9670 into donut

Merge commit '747cb3b515e1b01f6b61ec911b693d88d480eaaf'

* commit '747cb3b515e1b01f6b61ec911b693d88d480eaaf':
  Make aidl annotate onTransact with @Override