OSDN Git Service

Merge "[AWARE] Fix unit tests" into oc-dev
authorEtan Cohen <etancohen@google.com>
Wed, 29 Mar 2017 17:39:04 +0000 (17:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 29 Mar 2017 17:39:04 +0000 (17:39 +0000)
am: 6fd057cf58  -s ours

Change-Id: I01ae199e6cc506fbc358bac796c0d59fb47e9998


Trivial merge