| commit | c20f795518849c80200f239690ffb1a7e0984453 | [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 | cc3a9afd44f28ea1509de677db9f2a8946a1aeae [diff] | |
| parent | 0ca5673dc7f36e6e87e3b92acbd5752969ccc929 [diff] |
resolve merge conflicts of ed3596a to stage-aosp-master Change-Id: I3c41782e2bf3563d3e3d6232d39eff3da94843fc