| commit | 195669febcdac6ca7a2ad35cab1e2ffbb2adb0c9 | [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 | 5b7c6772b091ad9b389b22684b8398a077a139bb [diff] | |
| parent | a4398c1abeafa173a20c08ce28aba289fd35f9c3 [diff] |
resolve merge conflicts of a4398c1 to stage-aosp-master Change-Id: I550d5716bd5879f779d11509366090bf508731e4