commit | e7c936812e4ab4e85d66bd35b716b91a5620098b | [log] [tgz] |
---|---|---|
author | Tao Bao <tbao@google.com> | Wed May 06 23:54:12 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 06 23:54:12 2015 +0000 |
tree | 3136b393812950303b9a67a4c9743cc9ec1683c6 | |
parent | 45903c33cf4f638b2bf2d88b38d63119fb05f2c3 [diff] | |
parent | 2ab0a57211bbfe62f8730550b8456e17ce59d5cf [diff] |
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