| commit | 7135a3ca37970551a85d477650e43717b1094987 | [log] [tgz] |
|---|---|---|
| author | Justin Yun <justinyun@google.com> | Fri Sep 29 12:53:53 2017 +0900 |
| committer | Justin Yun <justinyun@google.com> | Fri Sep 29 12:53:53 2017 +0900 |
| tree | 21bb385701d0c98a52af2687fc86f50e55cf51c0 | |
| parent | 5dac24ca3efd56c0f2304b722abd7ad2ee0f8e91 [diff] | |
| parent | 3bc992fb7a910939fd55466f6816a90b3933172b [diff] |
resolve merge conflicts of 3bc992f to oc-mr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: Ic601841ff071618110eb47141d5e98d3d7ae66bb