summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-08-23 19:08:27 -0700
committerJean-Baptiste Queru <jbq@google.com>2010-08-23 19:08:27 -0700
commita1b232493d76bdf5e56fc5aae2a45691d6774369 (patch)
tree2fdc3157853e469b8ecc5fd8cfad71e42e08a84a
parent01f0908b3e8c759a9fcd565f6bc6cc6c4033678f (diff)
parente2e6ffa7f15b8ee33448e255edc231a9d01923b2 (diff)
downloadframeworks_av-a1b232493d76bdf5e56fc5aae2a45691d6774369.zip
frameworks_av-a1b232493d76bdf5e56fc5aae2a45691d6774369.tar.gz
frameworks_av-a1b232493d76bdf5e56fc5aae2a45691d6774369.tar.bz2
merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Change-Id: I69ed3eabde3cd32bea57315c0f031839caea4d4e
0 files changed, 0 insertions, 0 deletions