tree aee0209514cf3ce7c88da5d7922b1dccc29100cd
parent f82e74116314c4def32013495337c038f6c6ee6c
parent f2c3a8331ca9ec61aba82c4af6c8c7aa75d56f14
author Doug Zongker <dougz@android.com> 1336174184 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1336174185 -0700

Merge "add -f option to mkbootfs to load file perms from file" into jb-dev