summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2012-09-30 18:17:32 -0700
committerThe Android Automerger <android-build@android.com>2012-09-30 18:17:32 -0700
commit458923c1225977d8c5b596deffcb70fcabe9b139 (patch)
treebc282d9d295339220829c2cdade7a3eca5fb898e
parent087dd8e7232e4c009e9121ab7e8c37985522c9ad (diff)
parenta317c9d3c3aed59d5b136768b1707bdd0d73ea09 (diff)
downloadframeworks_av-458923c1225977d8c5b596deffcb70fcabe9b139.zip
frameworks_av-458923c1225977d8c5b596deffcb70fcabe9b139.tar.gz
frameworks_av-458923c1225977d8c5b596deffcb70fcabe9b139.tar.bz2
merge in jb-mr1-release history after reset to jb-mr1-dev
0 files changed, 0 insertions, 0 deletions