Makoto Onuki 639a862315 Merge \"Hide more shortcut APIs\" into nyc-mr1-dev ...

am: 07e234c9d7

Change-Id: If18c62359352c928e2b36c42563d5223c517964e

2016-07-07 21:10:00 +00:00

..

java

Merge \"Hide more shortcut APIs\" into nyc-mr1-dev

2016-07-07 21:10:00 +00:00

jni

Merge changes from topic \'fifo\' into nyc-mr1-dev

2016-07-07 20:48:27 +00:00

res

Merge \"Fix comment. The color is cyan 500 not teal.\" into nyc-mr1-dev

2016-07-07 20:07:43 +00:00

tests

Merge \"Update DisplayMetrics when resizing\" into nyc-dev

2016-06-24 23:42:34 +00:00