summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2012-08-27 06:34:04 -0700
committerThe Android Automerger <android-build@android.com>2012-08-27 06:34:04 -0700
commit98112828ca591083b2adef77a6bd17bbf8a08778 (patch)
treeb0eae1a1f04f1c363f7c5e7b20fef9b5334c67dc
parent225c66a48cdc3acef21ee380dc134449749d3cb3 (diff)
parent55e5eee17d5199c649f1d7ec2a223ab455c409a8 (diff)
downloadframeworks_native-98112828ca591083b2adef77a6bd17bbf8a08778.zip
frameworks_native-98112828ca591083b2adef77a6bd17bbf8a08778.tar.gz
frameworks_native-98112828ca591083b2adef77a6bd17bbf8a08778.tar.bz2
merge in jb-mr1-release history after reset to jb-mr1-dev
0 files changed, 0 insertions, 0 deletions