tree 8925704da3e23d9386671ca175769bd922e31e69
parent 536c23cbb046bd8410cb0ddad8899900d6f30e96
parent decfdbe405a2292187ac02f53e95b084bc3ae86d
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