summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2012-10-16 17:30:45 -0700
committerThe Android Automerger <android-build@android.com>2012-10-16 17:30:45 -0700
commitb28efde63809543cfb0162abfea1df2bb1ec5c05 (patch)
tree60914d0fb65b4143321183c66d5821e7457c607b
parent825a9a2dcd1b3e139dd0677ff46f966fb23f963c (diff)
parentaf49b5e2c79728996e37a4e682be860330c18edc (diff)
downloadframeworks_native-b28efde63809543cfb0162abfea1df2bb1ec5c05.zip
frameworks_native-b28efde63809543cfb0162abfea1df2bb1ec5c05.tar.gz
frameworks_native-b28efde63809543cfb0162abfea1df2bb1ec5c05.tar.bz2
merge in jb-mr1-release history after reset to jb-mr1-dev
0 files changed, 0 insertions, 0 deletions