From: Qiwen Zhao Date: Fri, 10 Jul 2015 01:54:35 +0000 (+0000) Subject: am 3f8fbfdb: (-s ours) am 982719b1: (-s ours) DO NOT MERGE ANYWHERE. reset back to... X-Git-Tag: android-x86-7.1-r1~326^2~19^2~56 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5cf4b4e1ed7a24f95440a3f072a60e2a3c1c7bec;p=android-x86%2Fframeworks-native.git am 3f8fbfdb: (-s ours) am 982719b1: (-s ours) DO NOT MERGE ANYWHERE. reset back to 570052f with history. * commit '3f8fbfdb9bde70454f617ab8f59874bdf132cb29': --- 5cf4b4e1ed7a24f95440a3f072a60e2a3c1c7bec