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)
commitbf0022d192ac05e2bde101c36269c784c936436e
treeb2b4a68ac524e49d54e8b2d761704cb570802ffa
parentb36a9e0eb56c22888615bd52e6614ee513f18a23
parent6fd057cf5850fb454676762c2ada010ddcc405bf
Merge "[AWARE] Fix unit tests" into oc-dev
am: 6fd057cf58  -s ours

Change-Id: I01ae199e6cc506fbc358bac796c0d59fb47e9998