Jeff Brown 4c9041cf83 am 1ac13e02: am 682ed6b6: Merge "resolved conflicts for merge of 694c1d2b to lmp-mr1-dev" into lmp-mr1-dev ...

* commit '1ac13e0212a770c918d32e6c645682466113632c':
  Support keeping activities resumed while dozing.

2014-11-21 21:59:47 +00:00

..

android

am 1ac13e02: am 682ed6b6: Merge "resolved conflicts for merge of 694c1d2b to lmp-mr1-dev" into lmp-mr1-dev

2014-11-21 21:59:47 +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

…