Todd Kennedy 9e25e1645f am e7078e18: Merge "Ensure host is set before onInflate()" into mnc-dev ...

* commit 'e7078e181cd00d20ce7764efa9835e2604a3cb83':
  Ensure host is set before onInflate()

2015-08-31 22:45:23 +00:00

..

java

am e7078e18: Merge "Ensure host is set before onInflate()" into mnc-dev

2015-08-31 22:45:23 +00:00

jni

Merge "Fix DngCreator default crop calculations." into mnc-dr-dev

2015-08-28 21:42:26 +00:00

res

Import translations. DO NOT MERGE

2015-08-26 11:10:31 -05:00

tests

Fix check for caller being the active network scorer

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