Narayan Kamath 98c6029878 am 97ee3f7c: resolved conflicts for merge of 98b8fe74 to lmp-mr1-dev-plus-aosp ...

* commit '97ee3f7ca6ca3959f4fff4d264921c1c4e379bba':
  Stop using DATE_FORMAT from settings.

2014-11-24 16:39:35 +00:00

..

java

am 97ee3f7c: resolved conflicts for merge of 98b8fe74 to lmp-mr1-dev-plus-aosp

2014-11-24 16:39:35 +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

am b3498581: am 8e2e6683: am ab4a940a: Merge "Make default carrier name string look better." into lmp-mr1-dev

2014-11-22 02:42:15 +00: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