| commit | 5695ff4eea3bb99f41ba4942d3ab4622f6c0f5d7 | [log] [tgz] |
|---|---|---|
| author | Jesse Hall <jessehall@google.com> | Wed May 04 11:57:59 2016 -0700 |
| committer | Jesse Hall <jessehall@google.com> | Wed May 04 11:57:59 2016 -0700 |
| tree | 1d3106681f88d0018c2e7a8cd1623a432b35674d | |
| parent | 99438f59cb95616167dd90fd220191958093aed6 [diff] | |
| parent | f1d0fda80c75391be36f8577f1cd888650ebb2ac [diff] |
resolve merge conflicts of f1d0fda to nyc-mr1-dev-plus-aosp Change-Id: Idc687824aae05ad41d3ffc8f696f98351d306f8d