summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2013-05-15 05:55:21 -0700
committerThe Android Automerger <android-build@android.com>2013-05-15 05:55:21 -0700
commit9f51d988bcd7115b691a67b851760d0c66f869db (patch)
treeef44b1410f6787df83af7293ad14751e6c47c16d
parentceac5fb92841bdaa16f0b801aaad07914438ad50 (diff)
parent2d9c5cf79de245d77d8c2bff5d783a2ad701a499 (diff)
downloadframeworks_av-9f51d988bcd7115b691a67b851760d0c66f869db.zip
frameworks_av-9f51d988bcd7115b691a67b851760d0c66f869db.tar.gz
frameworks_av-9f51d988bcd7115b691a67b851760d0c66f869db.tar.bz2
merge in jb-mr2-release history after reset to jb-mr2-dev
0 files changed, 0 insertions, 0 deletions