commit | a8036f1fa3e775c6ba89905d13196c5989759354 | [log] [tgz] |
---|---|---|
author | Ben Chan <benchan@chromium.org> | Wed Jun 25 11:02:43 2014 -0700 |
committer | Ben Chan <benchan@chromium.org> | Wed Jun 25 11:03:10 2014 -0700 |
tree | 368d6ef41f88ea13fab09441370abde1b0ac7758 | |
parent | df698ec9ccadd43565d42cb5d576032cfd077fc1 [diff] | |
parent | ecb9afd752e661e31166ad91bfd931acb75dc8e5 [diff] |
Merge branch 'merge-image-burner-rewrite' into merge-image-burner BUG=chromium:388280 Change-Id: I64e3fa81f77a21054a9cd1d90872ebf3b1c00910