summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2012-08-15 06:34:09 -0700
committerThe Android Automerger <android-build@android.com>2012-08-15 06:34:09 -0700
commit5dea1cecbe6e454e22571cdd31b9db3ffc0f3261 (patch)
treed2e4f73fd06a02832e10b381ef09ce31177f7826
parentf363ec5564abf4788d07e00d89c93a66a0c91b88 (diff)
parent1d5c225d32524a54494b65c6b619b4e4d3eed3cc (diff)
downloadframeworks_av-5dea1cecbe6e454e22571cdd31b9db3ffc0f3261.zip
frameworks_av-5dea1cecbe6e454e22571cdd31b9db3ffc0f3261.tar.gz
frameworks_av-5dea1cecbe6e454e22571cdd31b9db3ffc0f3261.tar.bz2
merge in jb-mr1-release history after reset to jb-mr1-dev
0 files changed, 0 insertions, 0 deletions