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)
commit2db5d3d3a816e84532cb2a091e2c7ecc233faa54
tree30124bb5cd0f34b86cf64ad499307de055388d2e
parent0d53970f3a1e1283a51f2e14d48701a8da1cecb0
parent2461194985fac8b2933e4bd3e75f4006341aecf1
Merge changes from topic "keystorebp" am: a12eab69d1 am: 315bbfc213
am: 2461194985

Change-Id: Ibb0723012dd3a2e1a5b12810acd77c0a24292208