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

* commit '5ea0411f3900064f1d65b93bbe306525398ee4d7':
  SwipeDismissLayout makes activity opaque only after entry animation ends.

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

..

java

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

jni

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

2014-11-20 15:41:25 -08:00

res

am 8ae85003: Merge "Update scrollbars to match Material spec" into lmp-mr1-dev

2014-11-21 03:03:46 +00:00

tests

am 1d76d397: Merge "Fix wifi reconnection tests." into lmp-mr1-dev

2014-11-21 02:43:06 +00:00