| commit | ea893c48145599a83409d25d5bd266a8acfe66e1 | [log] [tgz] |
|---|---|---|
| author | Ben Chan <benchan@chromium.org> | Thu Jul 10 14:33:12 2014 -0700 |
| committer | Ben Chan <benchan@chromium.org> | Thu Jul 10 14:33:18 2014 -0700 |
| tree | 50136329ead3f18165ec39b29ec974fe2d633f3a | |
| parent | a57b4daf00db19dac7604a84f3975b92ef55457a [diff] | |
| parent | bc6c6e4648274e67803db5deaf9f82bca8df96e1 [diff] |
Merge branch 'merge-minijail-rewrite' into merge-minijail BUG=chromium:392609 Change-Id: Iaa48a088a1ed34afbedcaa7ab7f1b2999fc55b82