Adrian Roos 9cb060d0c3 am 7e1775d2: am 78195312: Merge "Disable fingerprint after force lock" into mnc-dr-dev ...

* commit '7e1775d246371422ae60ec4d825d70bc067a8962':
  Disable fingerprint after force lock

2015-08-31 20:27:55 +00:00

..

java

am 78195312: Merge "Disable fingerprint after force lock" into mnc-dr-dev

2015-08-31 20:16:57 +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