| commit | c1e954be80f9f6bac11b7aaa2f7d959e65aa212e | [log] [tgz] |
|---|---|---|
| author | Jeff Davidson <jpd@google.com> | Mon Nov 24 08:30:51 2014 -0800 |
| committer | Jeff Davidson <jpd@google.com> | Mon Nov 24 08:30:51 2014 -0800 |
| tree | 8f148c2f6b79773ad7f01ded2021a0f02f40dfed | |
| parent | d47a26a372ea27ddb9686d7defab43bf2bb0c8c6 [diff] | |
| parent | 3da579c563569616b56f9c2846d204b7cc1be9b6 [diff] |
resolved conflicts for merge of 3da579c5 to master Change-Id: I77de7fa5622cc614d3070d5dc1548e2aa2f8c1c7