summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2012-10-26 18:17:33 -0700
committerThe Android Automerger <android-build@android.com>2012-10-26 18:17:33 -0700
commitc0d3ce2614121cb15f8d27d5f9f53c65932af1c3 (patch)
tree138972cf3a84fa3e8043fdcc5a0223394bf17480
parente815552c9cb17be79cb3b7eb6fbdfa9ad81c861b (diff)
parent13ae89946332e776b57fa0752000ad4f0313ab44 (diff)
downloadframeworks_av-c0d3ce2614121cb15f8d27d5f9f53c65932af1c3.zip
frameworks_av-c0d3ce2614121cb15f8d27d5f9f53c65932af1c3.tar.gz
frameworks_av-c0d3ce2614121cb15f8d27d5f9f53c65932af1c3.tar.bz2
merge in jb-mr1-release history after reset to jb-mr1-dev
0 files changed, 0 insertions, 0 deletions