summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2012-08-14 07:06:56 -0700
committerThe Android Automerger <android-build@android.com>2012-08-14 07:06:56 -0700
commit1d5c225d32524a54494b65c6b619b4e4d3eed3cc (patch)
tree44b3ec3b449b948bf6092b44ed2f876735a7cf26
parent0088e930b17228f23ddfff4840ed6172da354730 (diff)
parentdce5500f2978ab705911eaecba6b3981b60acefa (diff)
downloadframeworks_av-1d5c225d32524a54494b65c6b619b4e4d3eed3cc.zip
frameworks_av-1d5c225d32524a54494b65c6b619b4e4d3eed3cc.tar.gz
frameworks_av-1d5c225d32524a54494b65c6b619b4e4d3eed3cc.tar.bz2
merge in jb-mr1-release history after reset to jb-mr1-dev
0 files changed, 0 insertions, 0 deletions