Wale Ogunwale f98a6f4101 Merge "Avoid configuration of callback being reset after relayout." am: cbcafde45e ...

am: 0170fb8281

* commit '0170fb8281d4de9364dc51985be26adea3163c0d':
  Avoid configuration of callback being reset after relayout.

2015-11-12 16:08:34 +00:00

..

java

Merge "Avoid configuration of callback being reset after relayout." am: cbcafde45e

2015-11-12 16:08:34 +00:00

jni

Merge "Parse method-trace properties only in debug builds." am: 8fa7e93050

2015-11-11 17:05:42 +00:00

res

Import translations. DO NOT MERGE

2015-11-11 18:41:18 +01:00

tests

am b57dd722: resolved conflicts for a884d81e to stage-aosp-master

2015-09-24 17:14:10 +00:00