tree 7b006bc00020f5e2a6a73823bd8d83d089e2bcc1
parent 7a8c1e6c51c55ca13413b6acf6398e59ff8452fd
parent 5b80f5dbfd8a3f1fbe180094153fbfdb4b1e242d
author Ying Wang <wangying@google.com> 1416538588 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416538588 +0000

am 5b80f5db: Support [-j <journal_size>] in mkuserimg.sh automerge: 8f85f69 automerge: 4ea0822

* commit '5b80f5dbfd8a3f1fbe180094153fbfdb4b1e242d':
  Support [-j <journal_size>] in mkuserimg.sh