| commit | 2015def72ca40c28a7d88866b616e1615493c7a0 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Thu Jan 12 08:12:21 2017 -0800 |
| committer | Mark Salyzyn <salyzyn@google.com> | Thu Jan 12 08:14:08 2017 -0800 |
| tree | 64a5c54cf15462b8a9d741bf248d6e9df42c5227 | |
| parent | aa527338693c883c669c2cd2b2fd32a45d8b71ff [diff] | |
| parent | c8d623eaf9d7cec4bb42ea2c338a67d3c9a865d0 [diff] |
resolve merge conflicts of c8d623e to master Test: build Bug: 34231211 Bug: 34227405 Change-Id: If3a01b1ff662fb2ad62d1daf5d9d9df9aa5ec724