| commit | 9dd5598ae90b252377fef14106436a73a868d29e | [log] [tgz] |
|---|---|---|
| author | Mark Wei <markwei@google.com> | Mon Oct 29 16:51:28 2012 -0700 |
| committer | Mark Wei <markwei@google.com> | Mon Oct 29 17:00:02 2012 -0700 |
| tree | 0dc2d17e8173160a6c96567c2cbd91603c64ca9e | |
| parent | 7c21e19482274e618c7a1457ba5d7f4bfab614b0 [diff] | |
| parent | 28ed566a7471cbd36c70bc9568840dd555dc64c3 [diff] |
resolved conflicts for merge of 28ed566a to master Change-Id: I7b97bf6ddb01e8bbc059708889a4dc30efe6c8e9