| commit | 872e45fbe55efbdb29e9aa57dc726367fd7c815e | [log] [tgz] |
|---|---|---|
| author | Gaurav Shah <gauravsh@google.com> | Mon Nov 02 15:03:44 2015 -0800 |
| committer | Gaurav Shah <gauravsh@google.com> | Mon Nov 02 15:03:44 2015 -0800 |
| tree | e8bbbd99ec9c4bf48e5ed6123186cd6b70a0811c | |
| parent | d49498b6f43f1a25309d2d88fd027e77672de3e3 [diff] | |
| parent | 5020f94ae4b147039d7007ba409352508dc79c55 [diff] |
resolve merge conflicts of 5020f94ae4 to master. Change-Id: I70d37521ef344640a8aa50ec37c170fcc0323e2e