OSDN Git Service

am 19324304: am d7da78a6: (-s ours) am f65354a9: Merge "Add bare-bones encryption...
authorMohamad Ayyash <mkayyash@google.com>
Thu, 27 Aug 2015 14:08:15 +0000 (14:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:08:15 +0000 (14:08 +0000)
* commit '19324304f363a55ccdb962e7b95a4e8bb693968d':


Trivial merge