| commit | 68f2e828d5b10ea2e9dcbb61c3eee51c5ca34c7c | [log] [tgz] |
|---|---|---|
| author | Sundong Ahn <sundongahn@google.com> | Mon Aug 28 14:11:41 2017 +0900 |
| committer | Steven Moreland <smoreland@google.com> | Mon Aug 28 21:35:37 2017 +0000 |
| tree | 8cec2def21d28166f2ea5cb6075b7259716c15e8 | |
| parent | 908f09578f3b32fb2e4d64f2890d93ef2c91d047 [diff] | |
| parent | e46ab1fdccb61bd939324de6ce35e94aaa8af9f5 [diff] |
DO NOT MERGE: resolve merge conflicts of e46ab1fd to oc-mr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: Ia68993a22b975d9a5dd19175988077481ded7559