summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2012-08-14 07:07:23 -0700
committerThe Android Automerger <android-build@android.com>2012-08-14 07:07:23 -0700
commit92f49e787729ad794078cee2fea8529c98308edb (patch)
tree0050b3fcea9ee008bb05b4f95b67031f19860eb6
parentf0083bf5288e0d430b0dc5cbc4b4852bce2ff1af (diff)
parent43509042872139771f82cf44f1cba46c8cf398fd (diff)
downloadframeworks_native-92f49e787729ad794078cee2fea8529c98308edb.zip
frameworks_native-92f49e787729ad794078cee2fea8529c98308edb.tar.gz
frameworks_native-92f49e787729ad794078cee2fea8529c98308edb.tar.bz2
merge in jb-mr1-release history after reset to jb-mr1-dev
0 files changed, 0 insertions, 0 deletions