From: The Android Open Source Project Date: Wed, 31 Oct 2012 16:19:14 +0000 (-0700) Subject: am 089111a8: (-s ours) Reconcile with jb-mr1-release - do not merge X-Git-Tag: android-x86-4.4-r1~494 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b5b52e73e9070408c6dd8b2d04a5f47ee50057b8;p=android-x86%2Fbionic.git am 089111a8: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '089111a80a6a167de827bf32ae2d2a935ff5874f': --- b5b52e73e9070408c6dd8b2d04a5f47ee50057b8