| commit | c9c527f81f9e5cad429bdc74103c918aaf9c2a1b | [log] [tgz] |
|---|---|---|
| author | Jiyong Park <jiyong@google.com> | Wed May 17 12:11:59 2017 +0900 |
| committer | Jiyong Park <jiyong@google.com> | Wed May 17 14:29:44 2017 +0900 |
| tree | 3dbd746e0c93c1b2e7457b073599a54203253a02 | |
| parent | 1475ef280c02f42c680f034d16828544f166bf90 [diff] | |
| parent | fbe9427241623fa47d3d0113c089d0613f4ca5f5 [diff] |
resolve merge conflicts of fbe942724 to oc-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Merged-In: I137c17d55940b783eab6d0125bc4d26b96bcc2f2 Change-Id: I90c3ff7c82a9b53ce00057fd87cf227d5faf0975