Marco Nelissen 8c98b8eb68 am 2fddfea3: am a3404263: am 2f71ee24: am ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev ...

* commit '2fddfea3e5311bb5503d148d7ad18240a13ee033':
  Fix NPE

2015-02-18 00:40:19 +00:00

..

java

am 2fddfea3: am a3404263: am 2f71ee24: am ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev

2015-02-18 00:40:19 +00:00

jni

Fingerprint: Adjust to HAL2 spec.

2015-02-13 15:47:43 -08:00

res

Import translations. DO NOT MERGE

2015-02-16 08:08:12 -08:00

tests

Merge "RegisteredServicesCache now saves files to a user-specific dir"

2015-02-13 17:05:11 +00:00