summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2012-08-23 06:33:50 -0700
committerThe Android Automerger <android-build@android.com>2012-08-23 06:33:50 -0700
commit55e5eee17d5199c649f1d7ec2a223ab455c409a8 (patch)
treeaf1d7c6eb66321e46f59a9ba66b58dc14b1f2428
parentbc46e0ad869befcfa97f6272615cdeae2135008f (diff)
parent11676d963f3a5c0148ec4d764b5ab55ae9cd40aa (diff)
downloadframeworks_native-55e5eee17d5199c649f1d7ec2a223ab455c409a8.zip
frameworks_native-55e5eee17d5199c649f1d7ec2a223ab455c409a8.tar.gz
frameworks_native-55e5eee17d5199c649f1d7ec2a223ab455c409a8.tar.bz2
merge in jb-mr1-release history after reset to jb-mr1-dev
0 files changed, 0 insertions, 0 deletions