Jorim Jaggi cb17416a8d am 0da89b76: resolved conflicts for merge of f0fc23a1 to lmp-mr1-dev-plus-aosp ...

* commit '0da89b76402816dade084166a97b1d352ae1f78b':
  Fixed several time related states for secondary users

2014-11-25 15:04:28 +00:00

..

java

am 0da89b76: resolved conflicts for merge of f0fc23a1 to lmp-mr1-dev-plus-aosp

2014-11-25 15:04:28 +00:00

jni

am 29d1b12d: am 05f7c39e: am fc4a7538: Merge "Revert "Frameworks/base: Mask Skia warning in GraphicsJNI""

2014-11-22 01:23:53 +00:00

res

Import translations. DO NOT MERGE

2014-11-24 11:01:19 -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