| commit | efaad3e2c6b74b754b7626fa5d4f9de17a544ac6 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Jul 25 10:33:41 2013 -0700 |
| committer | Elliott Hughes <enh@google.com> | Thu Jul 25 10:36:59 2013 -0700 |
| tree | b9a38662136daf1e8bbbcc68ec37cb2bafbd6af8 | |
| parent | 8cf4e13e466bf7a9dc9a3bee73c8a74f3fc4bb85 [diff] | |
| parent | a35ec14f7866c14c8878db6938e2619b6eefb3d1 [diff] |
resolved conflicts for merge of a35ec14f to master Change-Id: Ib2eb18fe6df2e404d0bf739b300fc200ca81f539