| commit | 7f5b29ff1e5debb36fda8679df3e75343b4ba39f | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Jun 27 09:54:25 2016 -0700 |
| committer | Elliott Hughes <enh@google.com> | Mon Jun 27 09:54:25 2016 -0700 |
| tree | b32270904cd5b25d0fd85a87fbb070b13e439d60 | |
| parent | 80744d867f4e6d3f9cf7a0ba99adeb36be8184a3 [diff] | |
| parent | 54c121962bdf68c7c66724159260c926ce58e351 [diff] |
resolve merge conflicts of 54c1219 to stage-aosp-master Change-Id: I4b3b2a8690cfe147929fd096de380a9d4b79f1ec