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)
* commit 'b7b686cadf6a07c74672d4e1c3aab30e7d24a545':
  Fix encryption strings


Trivial merge