| commit | 7b9c33b1e0e47f72d0af35d8a948900697da5871 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Jul 11 18:57:39 2013 -0700 |
| committer | Elliott Hughes <enh@google.com> | Thu Jul 11 18:58:07 2013 -0700 |
| tree | c7d4f05373df433bf8cba1a06eac2c97e8e8cf0d | |
| parent | 786b1232d201d46f59bd9da84bfcfcb9ad80bb6c [diff] |
Fix my incorrect merge resolution for 132b7d750e6f3e835676dfc5edbb94978f9370f8. The conflict was the actual intended change. Change-Id: Icc9493e4b24b7b53a18e2c7406ef24a81e4d4a7b