| commit | 2461194985fac8b2933e4bd3e75f4006341aecf1 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Wed Oct 25 05:39:06 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 25 05:39:06 2017 +0000 |
| tree | 357176f155712254ee3f9165e3434cd8180031a4 | |
| parent | b5154d71b2689e6d47177b6a6a53533388d58b12 [diff] | |
| parent | 315bbfc21316f24925c64079ee34b24063929a07 [diff] |
Merge changes from topic "keystorebp" am: a12eab69d1 am: 315bbfc213 Change-Id: I5ac8aa1079a4fdb23a8745e9998d947c85c98e7f