OSDN Git Service

Merge "Add a factoryReset method to IIpMemoryStore, and freeze api." into qt-dev
authorLorenzo Colitti <lorenzo@google.com>
Mon, 20 May 2019 16:22:18 +0000 (09:22 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 20 May 2019 16:22:18 +0000 (09:22 -0700)
am: 39af041253

Change-Id: If20ca5ff71659d6e83a4bbd6236394e7b02f677a


Trivial merge