Filip Gruszczynski 5e4c382d15 resolved conflicts for merge of 17ba2e6c to mnc-dev ...

Change-Id: I9177f0e994e1e8fba02faf5a13f2dcec950ec5e0

2015-06-08 15:00:25 -07:00

..

java/com/android/server

resolved conflicts for merge of 17ba2e6c to mnc-dev

2015-06-08 15:00:25 -07:00

jni

Wait for wakeup_reasons on first init

2015-06-05 17:47:07 -07:00

Android.mk

resolved conflicts for merge of 962a11ad to master

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