| commit | 116ad98097145e2e19a8614e0de8ebfad35351f1 | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Mon Mar 30 17:45:55 2015 -0700 |
| committer | Trevor Johns <trevorjohns@google.com> | Mon Mar 30 17:45:55 2015 -0700 |
| tree | 4dc6bbd779dc0de1a3308855d42704d6d26f4f4b | |
| parent | c3c9e685c24c71ba5c17237e8302a66e089fd137 [diff] | |
| parent | 627d55c9ff4ba689c4138d97b3d887db24ee4a8c [diff] |
Resolve conflicts for merge of commit '627d55c9' into master Change-Id: Ib3e6cbf9bdfee8862bc834ac5cf47a28c212071d