| commit | b59e2961471db9ede954a3d843e0bb545bb290fa | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Jul 22 09:00:59 2016 -0700 |
| committer | Elliott Hughes <enh@google.com> | Fri Jul 22 09:00:59 2016 -0700 |
| tree | 012ec6d2b13ca19151d4ace78fab5dea1bf4591f | |
| parent | fde0beac8fa8c9a76732756424a298ae6e2c7498 [diff] | |
| parent | f5b35b65204cb979a693d62d37afbf1eb581258d [diff] |
resolve merge conflicts of f5b35b6 to stage-aosp-master Change-Id: Ie1ac182893214022a68746f563765f6a271f8d1d