Jason Monk 057ee76e5c Fix build ...

Fix bad merge

Change-Id: I2cd1f32a7e50b8fa1f7f85c52fe34111f7cea577

2016-01-11 14:37:44 -05:00

..

java

Fix build

2016-01-11 14:37:44 -05:00

jni

Merge "Add setMasterMono and getMasterMono"

2016-01-08 23:17:56 +00:00

res

Merge "Add a TETHER_PRIVILEGED permission and use it where needed."

2016-01-11 19:10:22 +00:00

tests

Merge "Add a TETHER_PRIVILEGED permission and use it where needed."

2016-01-11 19:10:22 +00:00