summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2012-08-30 06:34:01 -0700
committerThe Android Automerger <android-build@android.com>2012-08-30 06:34:01 -0700
commitedf7ba4a74b37913e8d6c0426715f50a6919c1e2 (patch)
tree95aa3e332069ae7220346f1f2aab6a0d6768498a
parent93997a8a75942b4d06cf50925de5bede489cc134 (diff)
parent6338654ed2e9f9816395d23e7b21cfc93fa94ac4 (diff)
downloadframeworks_native-edf7ba4a74b37913e8d6c0426715f50a6919c1e2.zip
frameworks_native-edf7ba4a74b37913e8d6c0426715f50a6919c1e2.tar.gz
frameworks_native-edf7ba4a74b37913e8d6c0426715f50a6919c1e2.tar.bz2
merge in jb-mr1-release history after reset to jb-mr1-dev
0 files changed, 0 insertions, 0 deletions