summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2012-08-28 06:33:39 -0700
committerThe Android Automerger <android-build@android.com>2012-08-28 06:33:39 -0700
commit87ffb20380f375c8906aa3ba16ebb196d4ba5274 (patch)
tree522f85faa8a80d4f86d0659b7694d871bc160953
parent2352a815fe99a00702dd00c5d1c6cfdfadba10fd (diff)
parent9c410063affbb32c3a300345c2422af1d47e82d4 (diff)
downloadframeworks_av-87ffb20380f375c8906aa3ba16ebb196d4ba5274.zip
frameworks_av-87ffb20380f375c8906aa3ba16ebb196d4ba5274.tar.gz
frameworks_av-87ffb20380f375c8906aa3ba16ebb196d4ba5274.tar.bz2
merge in jb-mr1-release history after reset to jb-mr1-dev
0 files changed, 0 insertions, 0 deletions