summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2012-09-16 17:12:14 -0700
committerThe Android Automerger <android-build@android.com>2012-09-16 17:12:14 -0700
commit0856beda56855af2472f4eeddbb386ea3707007d (patch)
tree0e3fed53f5ab460e1a65a18a8826af1deea0267f
parent376074ed1c3c368aeb336954a07632cd806288e2 (diff)
parentaaf9de4181e1ada862deac1d82c68cbfd984ff76 (diff)
downloadframeworks_av-0856beda56855af2472f4eeddbb386ea3707007d.zip
frameworks_av-0856beda56855af2472f4eeddbb386ea3707007d.tar.gz
frameworks_av-0856beda56855af2472f4eeddbb386ea3707007d.tar.bz2
merge in jb-mr1-release history after reset to jb-mr1-dev
0 files changed, 0 insertions, 0 deletions