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

Merge commit '3b197dfc7f90b5b7b65cbf7e62a13b088ef416d6'

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

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base