Xin Li ee2903686f Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into ...

marshmallow-dev" into mnc-dev.

Change-Id: I7215eebd4a2cc9a4b6ccf2a3e36ed8edc556d208

2016-10-13 13:51:42 -07:00

..

java

Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into

2016-10-13 13:51:42 -07:00

jni

Ensure munmap matches mmap

2016-09-12 17:53:14 +00:00

res

Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into

2016-10-13 13:51:42 -07:00

tests

Fix check for caller being the active network scorer

2015-08-06 12:53:59 -07:00