summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chet Haase <chet@google.com> 2010-09-17 15:55:11 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-09-17 15:55:11 -0700
commit79bc8e6be2e95eedfbfd91119a19a8ae445a9bc0 (patch)
treef91f2f416619186cd4c1c3e465af0a202fe47107
parente8ea8ccdb4d3905c6387d2e59317608d45e0fb3a (diff)
parent400a478227242fa7525dbb73eb0aa33b1d1122ad (diff)
am 6dcffb43: (-s ours) am 4a2b3ef1: Merge "new assets" into gingerbread
Merge commit '6dcffb434fff42b956b604e24a5b5728e721b686' * commit '6dcffb434fff42b956b604e24a5b5728e721b686': new assets
0 files changed, 0 insertions, 0 deletions