summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2012-10-01 06:59:20 -0700
committerThe Android Automerger <android-build@android.com>2012-10-01 06:59:20 -0700
commit988ae777fa6e1a8e6c604ac5964929c964409007 (patch)
tree0e83801bb331052c2d47fabfc156d625c1cc1132
parent135e5899f70a67e62baaf6dbec7ba2ce611ca16a (diff)
parented9af489edaee1714e25c3d40845a29255a40ae5 (diff)
downloadframeworks_native-988ae777fa6e1a8e6c604ac5964929c964409007.zip
frameworks_native-988ae777fa6e1a8e6c604ac5964929c964409007.tar.gz
frameworks_native-988ae777fa6e1a8e6c604ac5964929c964409007.tar.bz2
merge in jb-mr1-release history after reset to jb-mr1-dev
0 files changed, 0 insertions, 0 deletions