OSDN Git Service

Merge changes from topic "keystorebp" am: a12eab69d1
authorColin Cross <ccross@android.com>
Wed, 25 Oct 2017 05:39:06 +0000 (05:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 25 Oct 2017 05:39:06 +0000 (05:39 +0000)
commit2461194985fac8b2933e4bd3e75f4006341aecf1
tree357176f155712254ee3f9165e3434cd8180031a4
parentb5154d71b2689e6d47177b6a6a53533388d58b12
parent315bbfc21316f24925c64079ee34b24063929a07
Merge changes from topic "keystorebp" am: a12eab69d1
am: 315bbfc213

Change-Id: I5ac8aa1079a4fdb23a8745e9998d947c85c98e7f