| commit | 9c3ffab6fb92e36f42ebca83522328861acdf222 | [log] [tgz] |
|---|---|---|
| author | Sami Tolvanen <samitolvanen@google.com> | Mon Jun 06 23:07:54 2016 -0700 |
| committer | Sami Tolvanen <samitolvanen@google.com> | Mon Jun 06 23:07:54 2016 -0700 |
| tree | 17d09c1b654920dc1ce49a807c4341d6779ad060 | |
| parent | d7a4d6c7a6d6238dc16b6e73861890da98f84e7e [diff] | |
| parent | b69d2ff0551da25644b0b253414696d7df9d6626 [diff] |
resolve merge conflicts of d6f5af3 to nyc-mr1-dev-plus-aosp Change-Id: Ie579411df1d4f04a7f5f29457fbcf7b47c9d09ec