Wei Liu 8e4799ad45 resolved conflicts for merge of f0c4f0dd to mnc-dev ...

Change-Id: I16df088016c010aa25ee73ea8e68b3db8c0449e3

2015-05-13 09:57:33 -07:00

..

java/com/android/server

resolved conflicts for merge of f0c4f0dd to mnc-dev

2015-05-13 09:57:33 -07:00

jni

Add control for double tap to wake setting

2015-05-12 10:12:32 -04:00

Android.mk

resolved conflicts for merge of 962a11ad to master

2015-03-31 11:15:39 +01:00