OSDN Git Service

am 66e9cb11: am 27a4f2cd: (-s ours) am 44df7549: Merge "fix bug in mkf2fs tool calcul...
authorMark Salyzyn <salyzyn@google.com>
Thu, 27 Aug 2015 14:43:12 +0000 (14:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:43:12 +0000 (14:43 +0000)
* commit '66e9cb11cfd2363186bf22e924a1d76e161c6c11':


Trivial merge