Ajay Panicker ab96721a57 resolve merge conflicts of 4b39c15da0 to nyc-mr2-dev-plus-aosp ...

Change-Id: I7567db6d1fbb9f8a8b5e29c3e24cdff6508c4b6f

2017-03-14 14:01:57 -07:00

..

java

Merge "Bluetooth 5 spelling fixes" am: 5465fe0a2d

2017-03-13 18:16:24 +00:00

jni

Merge "Fix the reset of boosted zygote thread priority." am: 83aceea07d

2017-03-13 17:50:46 +00:00

res

resolve merge conflicts of 4b39c15da0 to nyc-mr2-dev-plus-aosp

2017-03-14 14:01:57 -07:00

tests

Merge "Refactor code incompatible with Mockito 2.7.13"

2017-03-10 20:43:07 +00:00