| commit | 1de57d883e41e7ea46fa4fab6b9da7044ed5cd7c | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Mon Jan 26 13:45:12 2015 -0800 |
| committer | Craig Mautner <cmautner@google.com> | Mon Jan 26 13:45:12 2015 -0800 |
| tree | e5d9e73c38fc210a0b00c6e6e149b2b0e806efd3 | |
| parent | e20b9941ae891b133008c6fb6a0aec6c8c85af23 [diff] | |
| parent | 2322ea558eced3deed94193d9b9d498f69b14a78 [diff] |
resolve merge conflicts of 2322ea5 to master. Change-Id: I1570e633bf0d552a32d7fa9a2e0ebd81953f632b