| commit | e52d9c5b83aac7f9ddfaa68a5ee1dac30fa2b242 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Aug 10 01:04:03 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Aug 10 01:04:03 2017 +0000 |
| tree | 7289052aee894da4cedaa0cbbf0b42ca3bd192c0 | |
| parent | b36b753d6e4d72dbdbdd54a98fc36d0cb111779e [diff] | |
| parent | 3845100bb5b247ad5abc32204141f35d981ef548 [diff] |
Merge "resolve merge conflicts of 40da4609e to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp