Evan Rosky 2bfd202ec5 Merge changes from topics "sf_task_id", "sf_metadata" ...

* changes:
  Add task-id to the task-level surface
  Add metadata store to surfaces

2019-01-25 23:15:36 +00:00

..

java

Merge changes from topics "sf_task_id", "sf_metadata"

2019-01-25 23:15:36 +00:00

jni

Merge changes from topics "sf_task_id", "sf_metadata"

2019-01-25 23:15:36 +00:00

proto

Merge "Add whitelist setting to proto dump util"

2019-01-25 22:16:00 +00:00

res

Merge "Do not sleep if someone is paying attention"

2019-01-25 21:55:51 +00:00

tests

Merge "Add api to change charging state update delay"

2019-01-25 22:42:06 +00:00