summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2012-10-29 11:19:49 -0700
committerThe Android Automerger <android-build@android.com>2012-10-29 11:19:49 -0700
commit090e1b311aabe287eae5bc4f7816d0384f284713 (patch)
treed301b2e845b570eea103e7224d766e8707cd8e7d
parent2295ce2c6fcf07ffaa134440691a8cea5fe35b43 (diff)
parentc0d3ce2614121cb15f8d27d5f9f53c65932af1c3 (diff)
downloadframeworks_av-090e1b311aabe287eae5bc4f7816d0384f284713.zip
frameworks_av-090e1b311aabe287eae5bc4f7816d0384f284713.tar.gz
frameworks_av-090e1b311aabe287eae5bc4f7816d0384f284713.tar.bz2
merge in jb-mr1-release history after reset to jb-mr1-dev
0 files changed, 0 insertions, 0 deletions