Svetoslav Ganov 388d08b6e3 resolve merge conflicts of a2c1196 to master ...

Change-Id: I221f03e2cda9e677199698d492d16788c25c9e96

2016-08-31 18:02:57 -07:00

..

java

resolve merge conflicts of a2c1196 to master

2016-08-31 18:02:57 -07:00

jni

resolve merge conflicts of a2c1196 to master

2016-08-31 18:02:57 -07:00

res

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

2016-08-31 16:15:37 -07:00

tests

DO NOT MERGE Manually merge commit 'f28778064383821ccf48c9570191f34a24aa513f' into nyc-mr1-dev-plus-aosp

2016-08-29 17:46:44 -07:00