Steven Moreland 96f4f9e2e9 Merge "HwBlob: s/malloc/calloc/" into oc-dev am: 123ffb6202 ...

am: f489aed3c1

Change-Id: Iea1bfc306161b065a3699fd780da28296f46dc96

2019-05-08 14:37:05 -07:00

..

java

DO NOT MERGE No smart text assist for unprovisioned device.

2019-02-04 21:26:48 +00:00

jni

Merge "HwBlob: s/malloc/calloc/" into oc-dev am: 123ffb6202

2019-05-08 14:37:05 -07:00

proto/android

Update diskstats to break out code & data.

2018-01-31 21:49:10 +00:00

res

DO NOT MERGE ANYWHERE: resolve merge conflicts of 77c1f60801 to oc-dr1-dev

2018-10-31 16:29:12 +00:00

tests

RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters.

2019-01-08 02:50:57 -08:00