| commit | 25d4ebdbc5c62cf9064115837b981a5757530305 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Jun 28 21:59:33 2016 -0700 |
| committer | Elliott Hughes <enh@google.com> | Tue Jun 28 21:59:33 2016 -0700 |
| tree | 7c3de34a2d67e60ede0c550d621d9784e7370426 | |
| parent | 8f7d445c65a7f34e1eb35a91ea069b95ffd915af [diff] |
Fix build breakage from merge conflict resolution. Change-Id: Icb623ebfb53a366cdd56674e87fa0781683e144e