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

am: af369f6e66

Change-Id: I6973f8f1053644548062b94c1696c123f47f0ad4

2016-08-24 22:14:28 +00:00

..

java

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

2016-08-24 22:14:28 +00:00

jni

DO NOT MERGE: Fix DngCreator default crop calculations.

2015-09-01 20:45:38 +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