| commit | 7690c52d306349e6e862cd3291ac522ffae93bb0 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Dec 10 13:47:44 2014 -0800 |
| committer | Elliott Hughes <enh@google.com> | Wed Dec 10 13:47:44 2014 -0800 |
| tree | 82164b6d42a61d221d7a5628fd0d39e5fd60b4a4 | |
| parent | 9accba1be414e485f6f50fc2ba4e9f6eacd4a729 [diff] | |
| parent | d86af4dc5d4e81834a9c54c9ee7ba1fe6b311e40 [diff] |
resolved conflicts for merge of d86af4dc to master Change-Id: I370474dee868bf69fca992c8dc6007706df5b6ac