| commit | 4dc40842ba310469b770f0e8e019e697777b0782 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Jun 27 10:49:57 2016 -0700 |
| committer | Elliott Hughes <enh@google.com> | Mon Jun 27 11:31:16 2016 -0700 |
| tree | d36a909fe906e0e877c32cf9be9a8dd6a93b6f1e | |
| parent | cbeeeaefb578c4fc8284b0de32552d3be0b121c0 [diff] | |
| parent | ab47d14f98063642fc51e2ec7f38be0abf16d14d [diff] |
resolve merge conflicts of ab47d14 to master Change-Id: Idf7b913e1f3ac6eff9ee2b314156c83996505641