| commit | 19b3e610c86fcadb837d252c794cb5e8008826ae | [log] [tgz] |
|---|---|---|
| author | Nam T. Nguyen <namnguyen@chromium.org> | Wed Jul 23 16:12:25 2014 -0700 |
| committer | Nam T. Nguyen <namnguyen@chromium.org> | Wed Jul 23 16:12:25 2014 -0700 |
| tree | b5382f0f65cf48e98eec618c94f67e4ff17764b5 | |
| parent | dc7812ea479304c309456c08c0f50e26d0e83f6c [diff] | |
| parent | bf1b5bfcaf60206821a4f450c17e70b143b1a74c [diff] |
Merge remote-tracking branch 'upstream/master' into bbb Conflicts: elftools/elf/dynamic.py Resolved by using upstream's verbatim copy because vapier's change is now in upstream. Change-Id: I6c597d4ef0a876d26736f96360cff95c072e8005