summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2012-10-12 16:32:47 -0700
committerThe Android Automerger <android-build@android.com>2012-10-12 16:32:47 -0700
commit37e0f656199131d975b54b5e990b05db6041593e (patch)
tree3acb417fd14c9d5df23d56c4675259e2aa1ea867
parentdd57d551944c01394bc2807d962be4953c58c7c1 (diff)
parenta58b6a4bcd0c2877694fc0800852ab58f2e78604 (diff)
downloadframeworks_native-37e0f656199131d975b54b5e990b05db6041593e.zip
frameworks_native-37e0f656199131d975b54b5e990b05db6041593e.tar.gz
frameworks_native-37e0f656199131d975b54b5e990b05db6041593e.tar.bz2
merge in jb-mr1-release history after reset to jb-mr1-dev
0 files changed, 0 insertions, 0 deletions