| commit | 1cc36b670571dd988360d40569a310b2761932f5 | [log] [tgz] |
|---|---|---|
| author | Malcolm Chen <refuhoo@google.com> | Mon Jul 30 14:42:47 2018 -0700 |
| committer | Xiangyu/Malcolm Chen <refuhoo@google.com> | Wed Aug 01 01:42:11 2018 +0000 |
| tree | aa3f064386c20fc95a2471cd8ce9aa7372e8e04b | |
| parent | 40eff199737465e3d5160a645fa15fd6029cd3db [diff] | |
| parent | 875a3fc05ff6dac1797b44cb6d0f814e9e723dc4 [diff] |
resolve merge conflicts of 875a3fc05ff6dac1797b44cb6d0f814e9e723dc4 to stage-aosp-master Bug: None Test: none Change-Id: I766b4eb035726afe456609a75758d40d50355fa9 Merged-In: Icfefd2cc17633304a397d573a9e010385c5799c8