| commit | 452003beefaeab4b9fc6cd9c47c61032d7247a2b | [log] [tgz] |
|---|---|---|
| author | Jack Yu <jackyu@google.com> | Sat Aug 05 17:57:33 2017 -0700 |
| committer | Jack Yu <jackyu@google.com> | Sat Aug 05 17:57:43 2017 -0700 |
| tree | 20b5bfd608df3e1ea606d4c23c87d3c7221683d1 | |
| parent | 83768112643c75bbf97affd3b4f06235813412dd [diff] | |
| parent | 5397f5a268917dd4cf62361ccf3a33a2c5e267ab [diff] |
resolve merge conflicts of 5397f5a26 to oc-dr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Merged-In: I413711c4af6374609f87f5aad63eb1a09fd22655 Change-Id: I3b481d9e0ed6d04226edeffe7445b70fe9833036