tree 194601c33310845d8a29907833ba484eaae6ec0c
parent 0cf6418e090764b6880f5a8af19e8f7f7fc41858
parent 3b197dfc7f90b5b7b65cbf7e62a13b088ef416d6
author Ying Wang <wangying@google.com> 1285871267 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285871267 -0700

am 3b197dfc: am 3caaa64e: Merge "Fix proguard flag file dependency." into gingerbread

Merge commit '3b197dfc7f90b5b7b65cbf7e62a13b088ef416d6'

* commit '3b197dfc7f90b5b7b65cbf7e62a13b088ef416d6':
  Fix proguard flag file dependency.