From: The Android Open Source Project Date: Thu, 11 Oct 2012 12:59:17 +0000 (-0700) Subject: am 2ad5a49a: (-s ours) Reconcile with jb-mr1-release - do not merge X-Git-Tag: android-x86-4.4-r1~23^2~512 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f45ffab037ff8ea5dc0ee8cd91c554baba77b249;p=android-x86%2Fframeworks-av.git am 2ad5a49a: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '2ad5a49adfefa0d9c34ec9ea387fc7a30f1e7be6': --- f45ffab037ff8ea5dc0ee8cd91c554baba77b249