OSDN Git Service

am b7b686ca: Merge "Fix encryption strings" into lmp-dev
authorPaul Lawrence <paullawrence@google.com>
Tue, 19 Aug 2014 20:59:13 +0000 (20:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 19 Aug 2014 20:59:13 +0000 (20:59 +0000)
commit17f213d781a394378c9e944d6fefee5dd56d7c25
tree1db7cdf65af9fbaea2cae65480045931ceebe363
parent71894714c920cc08aa15c1423d3f370cbcc2f409
parentb7b686cadf6a07c74672d4e1c3aab30e7d24a545
am b7b686ca: Merge "Fix encryption strings" into lmp-dev

* commit 'b7b686cadf6a07c74672d4e1c3aab30e7d24a545':
  Fix encryption strings