From: The Android Open Source Project <initial-contribution@android.com>
Date: Mon, 15 Oct 2012 14:40:50 +0000 (-0700)
Subject: Reconcile with jb-mr1-factory-release - do not merge
X-Git-Tag: android-x86-4.4-r1~69^2~32
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f5672fec;p=android-x86%2Fsystem-extras.git

Reconcile with jb-mr1-factory-release - do not merge

Change-Id: I5edb3257bf8f06c3274051af0c4da369d8643ca0
---

f5672feccfc4b3be0ddecc092b949710dec47bba