OSDN Git Service

am 836e7860: am 8120c3d1: Merge "Adding e4crypt support"
authorPaul Lawrence <paullawrence@google.com>
Fri, 27 Mar 2015 23:31:44 +0000 (23:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 27 Mar 2015 23:31:44 +0000 (23:31 +0000)
commit36b7b0c681279e385ee4267fc7f20fc5eee792b1
treee1aa395301e8d441e4162c57e51966ca43470f7f
parent05335c344d73411439774dfa548c633020e158e1
parent836e78608dcb16a490330e051416787df2ee14db
am 836e7860: am 8120c3d1: Merge "Adding e4crypt support"

* commit '836e78608dcb16a490330e051416787df2ee14db':
  Adding e4crypt support