OSDN Git Service

am 9f441da9: am dd22cb33: Actually encrypt stuff
authorPaul Lawrence <paullawrence@google.com>
Thu, 16 Jul 2015 16:26:11 +0000 (16:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Jul 2015 16:26:11 +0000 (16:26 +0000)
* commit '9f441da9d91298055cf9fd9ea7b4643aea33dd44':
  Actually encrypt stuff


Trivial merge