Jeff Sharkey 27674aedc0 Merge "Add auto-doc support for @StringDef."

2017-12-11 16:47:13 +00:00

..

java

Merge "Add auto-doc support for @StringDef."

2017-12-11 16:47:13 +00:00

jni

Merge "Revert "Remove empty ScopedArray constructor."" am: f6a0a7491b am: 73fce7397e

2017-12-09 14:08:18 +00:00

proto/android

Merge "Define fields in incident header and add a new proto to log internal incidentd metadata"

2017-12-08 22:50:22 +00:00

res

Merge "Import translations. DO NOT MERGE"

2017-12-08 05:31:41 +00:00

tests

Merge "Add helpers for generating keys, wrapping them, and persisting them"

2017-12-10 17:35:55 +00:00