Chih-Hung Hsieh ed4b31f9e1 Merge "Fix google-explicit-constructor warnings in core/jni." ...

am: cfc9f5d03d

Change-Id: Ia0378869ca5896734d5dfbdddf937b2b6dc25dbf

2016-08-30 20:37:41 +00:00

..

java

Merge changes from topic 'wifi-aosp-master' into stage-aosp-master

2016-08-29 20:03:22 +00:00

jni

Fix google-explicit-constructor warnings in core/jni.

2016-08-29 14:46:35 -07:00

res

DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework"

2016-08-29 20:15:59 -07:00

tests

Reenable the unit tests for StateMachine

2016-08-29 11:26:51 -07:00