OSDN Git Service

Merge changes from topic "keystorebp" am: a12eab69d1 am: 315bbfc213
authorColin Cross <ccross@android.com>
Wed, 25 Oct 2017 05:57:34 +0000 (05:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 25 Oct 2017 05:57:34 +0000 (05:57 +0000)
am: 2461194985

Change-Id: Ibb0723012dd3a2e1a5b12810acd77c0a24292208


Trivial merge