Adrian Roos 9a4d0257be am 520d20c1: am 702d9e31: Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev ...

* commit '520d20c1a8c2fbd0d6b7fdc19415167a6f45c866':
  Fix DPM.resetPassword("")

2014-11-25 15:09:24 +00:00

..

java

am 520d20c1: am 702d9e31: Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev

2014-11-25 15:09:24 +00:00

jni

Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp

2014-11-22 01:09:59 +00:00

res

Import translations. DO NOT MERGE

2014-11-24 07:13:23 -08:00

tests

am 54c11274: am c0491a2e: Merge "Lightweight checkin output for network stats." into lmp-mr1-dev

2014-11-21 22:09:28 +00:00