summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2012-10-20 23:14:02 -0700
committerThe Android Automerger <android-build@android.com>2012-10-20 23:14:02 -0700
commitca890f5add8864e0eed0b41c260b369f091032d0 (patch)
tree89c966f16a572049c2d60dce03d405d272aa725d
parentc3ed4a1c3ea71681c71de48c206a899e702864bd (diff)
parent5127deb5c9fcfa0c84d4ccf0a9613e6a28d8bc38 (diff)
downloadframeworks_av-ca890f5add8864e0eed0b41c260b369f091032d0.zip
frameworks_av-ca890f5add8864e0eed0b41c260b369f091032d0.tar.gz
frameworks_av-ca890f5add8864e0eed0b41c260b369f091032d0.tar.bz2
merge in jb-mr1-release history after reset to jb-mr1-dev
0 files changed, 0 insertions, 0 deletions