Yohann Roussel 5e2e4d669a Merge "Suppress warnings of MultiDexLegacyAndException" ...

am: 3289547de4

* commit '3289547de456d7a31ad3e0da316e8359f9736c80':
  Suppress warnings of MultiDexLegacyAndException

2016-02-17 15:41:21 +00:00

..

java

Merge "Alarm can end time-based rule." into nyc-dev

2016-02-17 15:27:48 +00:00

jni

Merge "Revert "Revert "VectorDrawable native rendering - Step 5 of MANY""" into nyc-dev

2016-02-16 23:38:43 +00:00

res

Import translations. DO NOT MERGE

2016-02-17 08:27:36 -05:00

tests

Merge "Suppress warnings of MultiDexLegacyAndException"

2016-02-17 15:41:21 +00:00