Andrii Kulian b6aa0cc60c Merge "Fix typo that caused excessive display config updates"

2017-01-11 18:47:00 +00:00

..

java/com/android/server

Merge "Fix typo that caused excessive display config updates"

2017-01-11 18:47:00 +00:00

jni

Merge "Use bitfields in GNSS HAL"

2017-01-11 18:33:21 +00:00

Android.mk

resolve merge conflicts of 46c39f6c36 to master

2017-01-11 16:15:13 +00:00