Hans Boehm c9532e8ac6 Merge "Naming fix and add comments" am: 3c03d5bd2b am: 24b9851605 ...

am: 4a901144fe

Change-Id: I1e2446f67e0505d30edb230f2dde70855c9fe00c

2017-09-26 12:42:41 +00:00

..

java

Merge "Naming fix and add comments" am: 3c03d5bd2b am: 24b9851605

2017-09-26 12:42:41 +00:00

jni

Merge "Naming fix and add comments" am: 3c03d5bd2b am: 24b9851605

2017-09-26 12:42:41 +00:00

proto/android

…

res

Merge "FRP: Add config flag for disabling credential FRP" into oc-mr1-dev

2017-09-25 18:38:23 +00:00

tests

Merge "Allow to enable WAL for testing" into oc-mr1-dev

2017-09-19 16:51:50 +00:00