| commit | 6188cc840d4987d2445740ce8a13dd335b6c6f73 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Jun 17 14:47:50 2014 -0700 |
| committer | Elliott Hughes <enh@google.com> | Tue Jun 17 14:47:50 2014 -0700 |
| tree | 94bc23d983f20338a7ec1debc16ccfc250ad0488 | |
| parent | aaddf1a8047e874ebba53b3b19d781d4a269423f [diff] | |
| parent | 63744c884dd4b4f4307f2b021fb894af164972af [diff] |
resolved conflicts for merge of 63744c88 to master Change-Id: I2dbbda225d0fbe61da34f93abbb466ed490ba405