summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2012-09-25 06:59:36 -0700
committerThe Android Automerger <android-build@android.com>2012-09-25 06:59:36 -0700
commit4968246a1fb70fcea422331effa4f446378dbdb8 (patch)
tree26121ac0af630b977911817c6cf22538aee57081
parent2a865ad8d45940bc824c02a8a8558cbcb97acc88 (diff)
parent46323541d634c881826040dece9e4891fdf0ae52 (diff)
downloadframeworks_av-4968246a1fb70fcea422331effa4f446378dbdb8.zip
frameworks_av-4968246a1fb70fcea422331effa4f446378dbdb8.tar.gz
frameworks_av-4968246a1fb70fcea422331effa4f446378dbdb8.tar.bz2
merge in jb-mr1-release history after reset to jb-mr1-dev
0 files changed, 0 insertions, 0 deletions