| commit | 6434965a08bb4cef4c2c6e9d69ed90b84195500b | [log] [tgz] |
|---|---|---|
| author | Malcolm Chen <refuhoo@google.com> | Mon Dec 25 18:00:54 2017 -0800 |
| committer | Xiangyu/Malcolm Chen <refuhoo@google.com> | Wed Dec 27 21:42:18 2017 +0000 |
| tree | 4f9e2135618fc6b1d07e00dab1c68d1831e4de24 | |
| parent | 22f6321b30bec902af35a2747e63298c956429db [diff] | |
| parent | 19b01442bf25ed9fd5a778f3cb0a66d25bffd824 [diff] |
Merge commit '19b01442bf25ed9fd5a778f3cb0a66d25bffd824' into manual_merge_19b01442bf25ed9fd5a778f3cb0a66d25bffd824 resolve merge conflicts of 19b01442bf25ed9fd5a778f3cb0a66d25bffd824 to oc-mr1-dev-plus-aosp. Change-Id: Iaed04050e43273e2e6effc071b0c0ce8d6773ea6 Merged-In: If7ffd91f64ff6974aef89e3b0fea9daaa7a1de31