summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2012-10-22 16:42:08 -0700
committerThe Android Automerger <android-build@android.com>2012-10-22 16:42:08 -0700
commit12f2c395c62c620060e233ed0820e94bef3a6541 (patch)
tree65c6059bd12beca43b36d5299337a9d77b4608e4
parentd17e3b5f6cf71eb52bc81f37719254ce08244b34 (diff)
parent92f89bd1e0ed26a1dd006d90fbc55eff7d184102 (diff)
downloadframeworks_native-12f2c395c62c620060e233ed0820e94bef3a6541.zip
frameworks_native-12f2c395c62c620060e233ed0820e94bef3a6541.tar.gz
frameworks_native-12f2c395c62c620060e233ed0820e94bef3a6541.tar.bz2
merge in jb-mr1-release history after reset to jb-mr1-dev
0 files changed, 0 insertions, 0 deletions