OSDN Git Service

Merge "Swap the order of synthetic password wrapping" into oc-mr1-dev
authorRubin Xu <rubinxu@google.com>
Sat, 2 Dec 2017 00:19:39 +0000 (00:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 2 Dec 2017 00:19:39 +0000 (00:19 +0000)
commit5743321bf12d3be85bca8e03740bd4f48368c015
tree9da18091f95537064bd9b837be28cf6a9f30d5aa
parent22d290b289c0748e41632da1fb8d0ce39fc0f526
parentb3ce6d33e07625a42181d23d62a7cc775eee3795
Merge "Swap the order of synthetic password wrapping" into oc-mr1-dev
am: b3ce6d33e0

Change-Id: Ie63ae6deb6a0454aa32a93f9aa867189c7390cdb