From: The Android Automerger <android-build@android.com>
Date: Thu, 13 Sep 2012 13:59:41 +0000 (-0700)
Subject: merge in jb-mr1-release history after reset to jb-mr1-dev
X-Git-Tag: android-x86-4.4-r1~23^2~80^2~195^2^2^2^2^2^2~5
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=25ec696c906739a987c2746a813e920663f30b75;p=android-x86%2Fframeworks-av.git

merge in jb-mr1-release history after reset to jb-mr1-dev
---

25ec696c906739a987c2746a813e920663f30b75