From: The Android Open Source Project Date: Tue, 2 Apr 2013 15:39:28 +0000 (-0700) Subject: Reconcile with jb-mr2-release - do not merge X-Git-Tag: android-x86-4.4-r1~23^2~171 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3682bccf805df8b854e3f465e2df614a5d583648;p=android-x86%2Fframeworks-av.git Reconcile with jb-mr2-release - do not merge Change-Id: Icef54451c7ccec9250f3d83a84558e2ed327264b --- 3682bccf805df8b854e3f465e2df614a5d583648