Alex Klyubin aedc94bf11 resolve merge conflicts of a9888fc to master ...

Change-Id: I6ad00bf5bc1b18406b7fc8969c35bf7970fd1967

2016-12-22 11:20:26 -08:00

..

java

resolve merge conflicts of a9888fc to master

2016-12-22 11:20:26 -08:00

jni

Merge "Move ContextHubService to a better location."

2016-12-22 04:37:00 +00:00

proto/android

Clean up file names for protos

2016-12-20 22:28:56 -08:00

res

Merge "Add attribute, theme values for error text color"

2016-12-22 18:25:22 +00:00

tests

Merge "Expose ScanResult#untrusted as a @SystemApi." am: a93e57f1ac am: a3943850ab

2016-12-21 20:10:30 +00:00