From: The Android Automerger <android-build@android.com>
Date: Mon, 9 Apr 2012 14:00:15 +0000 (-0700)
Subject: merge in jb-release history after reset to master
X-Git-Tag: android-x86-4.4-r1~333^2^2^2^2^2^2^2~2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c6f97abe8b5ffe7f7c47447e1d3dce2d8257e338;p=android-x86%2Fdalvik.git

merge in jb-release history after reset to master
---

c6f97abe8b5ffe7f7c47447e1d3dce2d8257e338