| commit | 57c1f708ba00ea976ca2d309202f6b4f6e21cf3b | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Aug 29 17:58:06 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Aug 29 17:58:06 2017 +0000 |
| tree | 5ed89fbebe97801e21cb88d5cd5f0025d5a1067a | |
| parent | 51c3de009edf2fea9221ac37b63af662d73e68ee [diff] | |
| parent | 826b6094a76efdfa747f477285bc7083bc80c73f [diff] |
Merge "resolve merge conflicts of 1a5e87918ebe to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp