tree dc4d6263c55f37825bd4ba11f475fcaa790d8e42
parent d9de65886807e700bcfcc583670844109422780d
parent 918ccff37260270d0eef3a3a7bfc2410c46d931a
author Doug Zongker <dougz@android.com> 1284685919 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284685919 -0700

am 918ccff3: Merge "consolidate target_files metadata into one key-value file" into gingerbread

Merge commit '918ccff37260270d0eef3a3a7bfc2410c46d931a' into gingerbread-plus-aosp

* commit '918ccff37260270d0eef3a3a7bfc2410c46d931a':
  consolidate target_files metadata into one key-value file