summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2012-08-22 06:33:35 -0700
committerThe Android Automerger <android-build@android.com>2012-08-22 06:33:35 -0700
commit2c26022a734ebc3eeed1a6380083e48a8b0b4361 (patch)
treef028cfdc6fc9d8309a5ba1cb0cb6eb020bbc3964
parent30e65e7e2ec01e13e45b5e38552a34d2fbb3f866 (diff)
parentddc9df02da1bf33d27b4d4f2ddf606b9c42ffaba (diff)
downloadframeworks_av-2c26022a734ebc3eeed1a6380083e48a8b0b4361.zip
frameworks_av-2c26022a734ebc3eeed1a6380083e48a8b0b4361.tar.gz
frameworks_av-2c26022a734ebc3eeed1a6380083e48a8b0b4361.tar.bz2
merge in jb-mr1-release history after reset to jb-mr1-dev
0 files changed, 0 insertions, 0 deletions