OSDN Git Service

am 8536d6cf: am 06a314d6: am e52c159c: Fix some strings for the encryption stuff.
authorAmith Yamasani <yamasani@google.com>
Fri, 17 Oct 2014 21:13:23 +0000 (21:13 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 17 Oct 2014 21:13:23 +0000 (21:13 +0000)
commit8a9a55acae4d74b593bb48777203270d60740932
tree15817416534b1f9d9d56a06d2c537258fec4d1c1
parentb3c1c0952800abdc9d37ebaa0c9bca18d345fc77
parent8536d6cfe9952415a2186011b6cebfb7d2c0ee91
am 8536d6cf: am 06a314d6: am e52c159c: Fix some strings for the encryption stuff.

* commit '8536d6cfe9952415a2186011b6cebfb7d2c0ee91':
  Fix some strings for the encryption stuff.