Chris Banes 09bf9e69bc Fix NPE in Toolbar - framework edition ...

am: 3b925c1ab0

Change-Id: I340ddff981e938bf6f9bd3f1392eec03f25f3e5d

2016-06-21 08:16:28 +00:00

..

java

Fix NPE in Toolbar - framework edition

2016-06-21 08:16:28 +00:00

jni

Merge \"DO NOT MERGE Move SurfaceView offscreen if the app stops drawing it\" into nyc-dev

2016-06-18 02:14:29 +00:00

res

Merge \"Enable tap-to-pulse only when needed\" into nyc-mr1-dev

2016-06-20 18:27:54 +00:00

tests

Merge \"Update enable/disable code to reduce flakiness\" into nyc-mr1-dev

2016-06-08 23:33:47 +00:00