Abodunrinwa Toki 4257b2df86 Merge "FloatingToolbar: Include scroll indicators in overflow." into nyc-dev ...

am: 856ebe2

* commit '856ebe206b054c86419df9bab945fabd156bebd6':
  FloatingToolbar: Include scroll indicators in overflow.

Change-Id: I5ecf71df2d274a6fe624f171121452bd360a138b

2016-04-06 16:43:44 +00:00

..

java

Merge "FloatingToolbar: Include scroll indicators in overflow." into nyc-dev

2016-04-06 16:43:44 +00:00

jni

Merge "Downgrades error messages about not being able to detect whether we are in protected mode or not to informational messages. If there is no GL context, then we are by definition not in protected mode, and still return false as advertised, thus there\'s no need for an error message." into nyc-dev

2016-04-05 23:25:24 +00:00

res

Merge "Protect more broadcasts." into nyc-dev

2016-04-06 15:05:14 +00:00

tests

Merge "Make FastXmlSerializer more suitable to persist arbitrary strings" into nyc-dev

2016-04-06 00:43:46 +00:00