David Christie 0777ad8253 resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1 am: af369f6e66 ...

am: d610363a48

Change-Id: I186b4bedcf057489deca1e161a052619ce594e56

2016-08-24 22:23:49 +00:00

..

java

resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24 am: 41a0dd41f1 am: af369f6e66

2016-08-24 22:23:49 +00:00

jni

Limit persistent ashmem backed fds to a minimum of 128kB.

2015-11-03 17:46:15 +00:00

res

Merge \\"DO NOT MERGE: Reduce shell power over user management.\\" into lmp-mr1-dev am: f1d9152f9f

2016-07-12 19:20:34 +00:00

tests

Fix check for caller being the active network scorer

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