Neil Fuller 6a3c315b25 Merge "Remove .mk lines that are just setting the default" ...

am: 8873c3821d

Change-Id: Ic3a02567b2983da067cccc9ce38a2e29ef3834b6

2016-10-06 08:37:54 +00:00

..

java

Merge "Handle the race condition when calling uncrypt services."

2016-09-30 20:40:03 +00:00

jni

Merge "Start hw-binder threadpool on HwBinder.getService() call."

2016-10-05 22:18:04 +00:00

res

Merge "Add editable_voicemail_number key to CarrierConfig"

2016-10-04 18:17:25 +00:00

tests

Remove .mk lines that are just setting the default

2016-10-05 13:38:36 +01:00