| commit | a27606b6406b87981c13e71e354d0a1223cd035c | [log] [tgz] |
|---|---|---|
| author | Zhuoyao Zhang <zhuoyao@google.com> | Tue Jul 25 21:16:04 2017 -0700 |
| committer | Zhuoyao Zhang <zhuoyao@google.com> | Tue Jul 25 21:16:04 2017 -0700 |
| tree | 80e8791567fe88c99b5a8068204809386038e04b | |
| parent | 87a14154a9a11c693bdcba9b7d6ff13b56788def [diff] | |
| parent | 39069060ff58f9fe9ad50b6363df1158110596b3 [diff] |
resolve merge conflicts of 8d92561 to oc-mr1-dev Test: I solemnly swear I tested this conflict resolution.