tree 60dc3826651ffca7d02fc0df5dba181cb7f4d319
parent 26cd348b1b12d04839c551c9645c9b04376c3d07
parent 7e818fdc87f7036d6b977f6a0d9e92d8ddc1404d
author Ying Wang <wangying@google.com> 1285871230 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285871230 -0700

am 7e818fdc: Fix proguard flag file dependency.

Merge commit '7e818fdc87f7036d6b977f6a0d9e92d8ddc1404d'

* commit '7e818fdc87f7036d6b977f6a0d9e92d8ddc1404d':
  Fix proguard flag file dependency.