OSDN Git Service

am 17f213d7: am b7b686ca: Merge "Fix encryption strings" into lmp-dev
authorPaul Lawrence <paullawrence@google.com>
Tue, 19 Aug 2014 21:08:15 +0000 (21:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 19 Aug 2014 21:08:15 +0000 (21:08 +0000)
commit9e3117de835f092de06473d9793c9be0eae34f35
tree1db7cdf65af9fbaea2cae65480045931ceebe363
parent5b22e3d03b0a06f49668b03140f95d2b5f2590c7
parent17f213d781a394378c9e944d6fefee5dd56d7c25
am 17f213d7: am b7b686ca: Merge "Fix encryption strings" into lmp-dev

* commit '17f213d781a394378c9e944d6fefee5dd56d7c25':
  Fix encryption strings