| commit | 5243288837d1c3698500caeeae2d661249f32450 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Jun 28 17:52:57 2016 -0700 |
| committer | Elliott Hughes <enh@google.com> | Tue Jun 28 17:52:57 2016 -0700 |
| tree | d0895291f34dd4ab8ca4a76b5e93b280144c9e53 | |
| parent | 899074f8bd2f274be2e5b7ba94893365a9f6a614 [diff] | |
| parent | 772137e2a2cc6dc08b1276bd1032bfd6b32531e4 [diff] |
resolve merge conflicts of cee6305 to nyc-mr1-dev-plus-aosp Change-Id: Ia81286d9631a6d1206195bd477b3cc577f543cc3