OSDN Git Service

Merge "@Keep all the things in TestAccessPointBuilder" into oc-dr1-dev
authorAntony Sargent <asargent@google.com>
Wed, 26 Jul 2017 16:18:33 +0000 (16:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Jul 2017 16:18:33 +0000 (16:18 +0000)
am: 1e74fdb684  -s ours

Change-Id: I489efc8ca8d93cd94ac71e2ea65f45e888a9a138


Trivial merge