OSDN Git Service

Merge "DO NOT MERGE: Fix ApfTest" am: 05f0bfe33e -s ours
authorHugo Benichi <hugobenichi@google.com>
Mon, 4 Sep 2017 04:14:38 +0000 (04:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 4 Sep 2017 04:14:38 +0000 (04:14 +0000)
am: 8887059b00  -s ours

Change-Id: I4d5fe729d56096f0aad725ff74e55d8db347f1f2


Trivial merge