| commit | ddf9066e2e850a1e0dc936a731994ec831581807 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Jul 08 11:15:27 2014 -0700 |
| committer | Elliott Hughes <enh@google.com> | Tue Jul 08 11:15:27 2014 -0700 |
| tree | c9ed96cfb1199eec5b807a3d7bbc9102b0235523 | |
| parent | e20bbaf8bbfb41b690e55be66eb327ebdcc61629 [diff] | |
| parent | aedc14b166e9eb1213637cf7ebf8e08ce29ab0dd [diff] |
resolved conflicts for merge of aedc14b1 to master Change-Id: Ib00a09a01541afb010f3c8a6f125d067a0c7812d