Jorim Jaggi 0da89b7640 resolved conflicts for merge of f0fc23a1 to lmp-mr1-dev-plus-aosp ...

Change-Id: I8f1dbae2ecd14ae4e51a9e86eb6d36dd56a48be1

2014-11-25 15:34:56 +01:00

..

android

resolved conflicts for merge of f0fc23a1 to lmp-mr1-dev-plus-aosp

2014-11-25 15:34:56 +01: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

…