| commit | 67ffd5e61730d4074c174fa72fb752666cc8bbe0 | [log] [tgz] |
|---|---|---|
| author | Glenn Kasten <gkasten@google.com> | Wed Aug 17 13:27:29 2016 -0700 |
| committer | Glenn Kasten <gkasten@google.com> | Wed Aug 17 13:28:04 2016 -0700 |
| tree | 94c43e292d8b72071eeec1aa6f8e4d06e16d56a4 | |
| parent | 9b36ce973e458125807b59c002d3a1602e0b800d [diff] | |
| parent | c76a3ac224833e7d3542f37543cfe4f63723e3f3 [diff] |
resolve merge conflicts of c76a3ac to stage-aosp-master Change-Id: Ifff16bdc42e8326f3f60cf4b92688c445cb4db25