summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2012-10-17 16:07:12 -0700
committerThe Android Automerger <android-build@android.com>2012-10-17 16:07:12 -0700
commit99991c948a8eccf89999f62a225819e8aec0df4f (patch)
tree949af0a177f329b28934ed59110d9e5cd0f72863
parent7f79a2bd5c92bc626890dc16ffb8cd2de934e5fb (diff)
parentb28efde63809543cfb0162abfea1df2bb1ec5c05 (diff)
downloadframeworks_native-99991c948a8eccf89999f62a225819e8aec0df4f.zip
frameworks_native-99991c948a8eccf89999f62a225819e8aec0df4f.tar.gz
frameworks_native-99991c948a8eccf89999f62a225819e8aec0df4f.tar.bz2
merge in jb-mr1-release history after reset to jb-mr1-dev
0 files changed, 0 insertions, 0 deletions