tree 591cb28b13f0bbcf9396bffb360eea5c8ae7919a
parent 9c7a5826ec6d1b8d056abe8fb21d95c9b945497a
parent df293f14f5bdb4f572c7f836ebb0802a177836ff
author The Android Automerger <android-build@google.com> 1402069326 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402069326 +0000

am df293f14: merge in master-release history after reset to b31f33b5e41bf295705b8f0c1582c6277e8fec64

* commit 'df293f14f5bdb4f572c7f836ebb0802a177836ff':
  Fix encryption on Nakasi