| commit | 6343cb5acd6b375cd4e2129e5709ee765e421f48 | [log] [tgz] |
|---|---|---|
| author | Chris Wren <cwren@android.com> | Thu Jun 02 17:04:35 2016 -0400 |
| committer | Chris Wren <cwren@android.com> | Thu Jun 02 17:04:35 2016 -0400 |
| tree | e92f9043917665f9cc7cdee49ca993b239210721 | |
| parent | 91b43d50fd5ee7bd89cace7f849e298c13f57f7d [diff] | |
| parent | 18455a9108f36e6577f2eebdbeb7781a0ad4751f [diff] |
resolve merge conflicts of 18455a9 to master Change-Id: I06da8fa1601633baad82be50ae881462d33ff27e