summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2012-10-07 18:57:53 -0700
committerThe Android Automerger <android-build@android.com>2012-10-07 18:57:53 -0700
commit7d55da3fab7090e8f8de981af7396cbc841b9837 (patch)
tree42d54fd8961661be8d2d1b85f0d98ac48f6c9bc0
parentc8823995d16b909fae30ff4f94217e875d3e8c8a (diff)
parent16cd9950a486d2ae8f4ea7a0eb3610fffce93868 (diff)
downloadframeworks_av-7d55da3fab7090e8f8de981af7396cbc841b9837.zip
frameworks_av-7d55da3fab7090e8f8de981af7396cbc841b9837.tar.gz
frameworks_av-7d55da3fab7090e8f8de981af7396cbc841b9837.tar.bz2
merge in jb-mr1-release history after reset to jb-mr1-dev
0 files changed, 0 insertions, 0 deletions