| commit | be02841e8215d93a780849ad9e797cbbe602dcd7 | [log] [tgz] |
|---|---|---|
| author | SzuWei Lin <szuweilin@google.com> | Thu May 04 14:59:49 2017 +0800 |
| committer | SzuWei Lin <szuweilin@google.com> | Thu May 04 14:59:49 2017 +0800 |
| tree | 651d81fe22da44a512175c5bb712af43e4af945f | |
| parent | 30d02c74d6e20eaf7e22c51a3d5f7e80629c1fd3 [diff] | |
| parent | 88874349da3970aad5b81509a56994eb1eb41f9e [diff] |
resolve merge conflicts of 88874349da to oc-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I62de4ad3072884e3a66e64bab417ea849b78fd10