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

..

android

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

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

com

am 5ea0411f: am a83c5806: Merge "SwipeDismissLayout makes activity opaque only after entry animation ends." into lmp-sprout-dev automerge: 96c5d37

2014-11-21 10:26:31 +00:00

jarjar-rules.txt

…

overview.html

…