From: The Android Open Source Project Date: Thu, 2 Aug 2012 22:09:11 +0000 (-0700) Subject: am 6c19776e: (-s ours) Reconcile with jb-mr1-release - do not merge X-Git-Tag: android-x86-4.4-r1~798 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7c4e0b6cefec2e2e4ca419f60ddc3ed1761ec67a;p=android-x86%2Fframeworks-native.git am 6c19776e: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '6c19776e9c8736b2f29f92e772469724cf55c1e4': --- 7c4e0b6cefec2e2e4ca419f60ddc3ed1761ec67a