tree aa092cd71b8046b750a2b5989c8e2bc503d53b56
parent 0e95070766dc499f66706c12253dda11d31ab014
parent 27a0be36eeee9d1d03076727977dfb1e725fcd77
author Christopher Wiley <wiley@google.com> 1442245658 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442245658 +0000

am 27a0be36: resolved conflicts for ddf53180 to stage-aosp-master

* commit '27a0be36eeee9d1d03076727977dfb1e725fcd77':
  Remove the aidl tool