| commit | e7180713d067dcedf6f9097a909deb21addb8746 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Oct 13 19:04:07 2016 -0700 |
| committer | Elliott Hughes <enh@google.com> | Thu Oct 13 19:04:07 2016 -0700 |
| tree | 0cc6495bb2321ea64c958432fa1f6021e23a2e16 | |
| parent | 23e9e5d54ebd47bf75fd98eedaa047a3a6519768 [diff] | |
| parent | 011d95f4efd75e607f7599c5379ca1e7e983829a [diff] |
resolve merge conflicts of a4398c1 to stage-aosp-master Change-Id: I550d5716bd5879f779d11509366090bf508731e4