tree 3136b393812950303b9a67a4c9743cc9ec1683c6
parent 45903c33cf4f638b2bf2d88b38d63119fb05f2c3
parent 2ab0a57211bbfe62f8730550b8456e17ce59d5cf
author Tao Bao <tbao@google.com> 1430956452 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430956452 +0000

am 2ab0a572: resolved conflicts for merge of 550bd340 to mnc-dev-plus-aosp

* commit '2ab0a57211bbfe62f8730550b8456e17ce59d5cf':
  uncrypt: package on non-data partition should follow the right path