tree 41b012f385db8a87c920db44b35199dd1e2e119e
parent 3e9413473f87ad17f3767ffbb0c57046c2db29be
parent 9d829f98dc19edecb2305b61b9c79517c4f95383
author Xavier Ducrohet <xav@android.com> 1313703936 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1313703936 -0700

am 9d829f98: am 21e6e2de: Merge "Change generated dependency file names"

* commit '9d829f98dc19edecb2305b61b9c79517c4f95383':
  Change generated dependency file names