OSDN Git Service

Merge "Fix encrypt-and-wipe" into lmp-mr1-dev
authorPaul Lawrence <paullawrence@google.com>
Tue, 2 Dec 2014 18:20:04 +0000 (18:20 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 2 Dec 2014 18:20:04 +0000 (18:20 +0000)
commitd44a8f59a7518b87a3fe4174c78dfb9727e63f89
tree3fe982991dd6ab254e1cbfeb9d4283f4d3f5c261
parentb25302e1b0232ac2f9d6ffa441f2ab1ff23a2de3
parentb1eb7a06ee24078efb3a7efaa32c1561b92f4cb8
Merge "Fix encrypt-and-wipe" into lmp-mr1-dev