summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2012-11-01 19:05:16 -0700
committerThe Android Automerger <android-build@android.com>2012-11-01 19:05:16 -0700
commitf5037ad1ebb04e99622af5e99aeac0c1b44090b7 (patch)
treeff74d91d61bbcb4ddf8af89ea9f49f72e6d00da6
parent96076964863ee6887f0bed9d0f11f424b48ab9b9 (diff)
parent006ceacb82f62a22945c7702c4c0d78f31eb2290 (diff)
downloadframeworks_av-f5037ad1ebb04e99622af5e99aeac0c1b44090b7.zip
frameworks_av-f5037ad1ebb04e99622af5e99aeac0c1b44090b7.tar.gz
frameworks_av-f5037ad1ebb04e99622af5e99aeac0c1b44090b7.tar.bz2
merge in jb-mr1-release history after reset to jb-mr1-dev
0 files changed, 0 insertions, 0 deletions