From: The Android Open Source Project Date: Mon, 15 Apr 2013 17:46:12 +0000 (-0700) Subject: Reconcile with jb-mr2-release - do not merge X-Git-Tag: android-x86-4.4-r1~115^2~45 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=987f727da2f90d428ae773a58cafc4ea67737aab;p=android-x86%2Fframeworks-native.git Reconcile with jb-mr2-release - do not merge Change-Id: I98befd6a263feb5235d4a8aa20abff47a2a8a097 --- 987f727da2f90d428ae773a58cafc4ea67737aab