| commit | b6e1d15056f2a9c136a640336d78d36ab58a719d | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Aug 03 13:29:04 2016 -0700 |
| committer | Elliott Hughes <enh@google.com> | Wed Aug 03 13:29:04 2016 -0700 |
| tree | 5de391aecdda2209bed566b67f5b3d5fbb591a78 | |
| parent | 7e74e816460f0c130b6870f5251b03d4218c80da [diff] | |
| parent | ed3596aadfe5727752a2e93a8fa2a981dce5e8e5 [diff] |
resolve merge conflicts of ed3596a to stage-aosp-master Change-Id: I3c41782e2bf3563d3e3d6232d39eff3da94843fc