| commit | 6e1ef6432a71c9d0e1331eb573725b4e6ed78595 | [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 | 8478b1f7397d168cd8b5f34743961cfd77c200bc [diff] | |
| parent | cee6305779f3c1146af381a2bda19cd6ae159b83 [diff] |
resolve merge conflicts of cee6305 to nyc-mr1-dev-plus-aosp Change-Id: Ia81286d9631a6d1206195bd477b3cc577f543cc3