| commit | f37ac6c6ff9fc3c07ce80399cc79d4bd204f9d49 | [log] [tgz] |
|---|---|---|
| author | Sarah Hu <xiaoyinh@google.com> | Fri Apr 14 16:24:35 2017 -0700 |
| committer | Sarah Hu <xiaoyinh@google.com> | Fri Apr 14 16:24:43 2017 -0700 |
| tree | 38560ddcc54278accfbeb4be467c10e6b28924ff | |
| parent | f344ce50a90029258293ecdc63e7f452002b3a57 [diff] | |
| parent | 982294a5984a757b839809ec9c699369a26d00b6 [diff] |
resolve merge conflicts of 982294a598 to oc-dev Test: I solemnly swear I tested this conflict resolution. Change-Id: I1cd0cb564becf51536651ed2af7d216b26dfecce