tree a015a9116356cd43f1e174893e299e1a23cbbcb1
parent 60587efe1a60ed698db9e2cafcd48f2c3fc8aa40
parent b159e77b99883125831eeded394c160b0637f93b
author Ying Wang <wangying@google.com> 1285871269 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285871269 -0700

am b159e77b: Fix proguard flag file dependency.

Merge commit 'b159e77b99883125831eeded394c160b0637f93b'

* commit 'b159e77b99883125831eeded394c160b0637f93b':
  Fix proguard flag file dependency.