Julia Reynolds 52e063ee15 Merge "Rename badge icon method" into oc-dev ...

am: ed8d07f213

Change-Id: I26f8b9cf46ebd30608bd038dde946e7139c9f25a

2017-03-31 16:41:27 +00:00

..

java

Merge "Rename badge icon method" into oc-dev

2017-03-31 16:41:27 +00:00

jni

Pass correct size of integer to CallVoidMethod.

2017-03-31 01:24:22 +00:00

proto/android

CEC: Revisit the behavior of HDMI_SYSTEM_AUDIO_ENABLED

2017-03-13 20:00:58 +09:00

res

Merge "Split scroll factor into a 2d float." into oc-dev

2017-03-31 14:54:45 +00:00

tests

Merge changes I5c16c650,I3151fb6b am: 55efea25f3 am: ad2684ca3d

2017-03-29 18:41:16 +00:00