| commit | bbf3eb56b627d0fe9cecc57bf3fc8c3dfc3270d5 | [log] [tgz] |
|---|---|---|
| author | Christopher Lane <lanechr@google.com> | Mon Apr 14 15:14:01 2014 -0700 |
| committer | Christopher Lane <lanechr@google.com> | Mon Apr 14 15:14:01 2014 -0700 |
| tree | 447543875a1772c7070e6513da42f088d5127a31 | |
| parent | 69094d47a8577ac8980439d287ed555f95715053 [diff] | |
| parent | 6d1b0b70aff7a7b2e3fb5cc3c3b923b92b6f1702 [diff] |
resolved conflicts for merge of 381ac080 to master Change-Id: I779c49c48980ba7737ee4e7b04a9e4c3e02fca21