OSDN Git Service

am 9a795187: (-s ours) am 86c942a2: (-s ours) DO NOT MERGE Delete password as per...
authorPaul Lawrence <paullawrence@google.com>
Mon, 1 Jun 2015 16:12:03 +0000 (16:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 16:12:03 +0000 (16:12 +0000)
* commit '9a795187ee7cd75cf5398c8e7f3c6137a1913853':
  DO NOT MERGE Delete password as per block encryption


Trivial merge