| commit | d30cf791f69288978b925084ae053154a6b232de | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Jun 14 06:22:12 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jun 14 06:22:14 2017 +0000 |
| tree | d88d8292af315b87f85cd01a1fdb4ad911ddf73c | |
| parent | dd6403d8ffb1b6c4c19d57b556564770153a944b [diff] | |
| parent | 35998bb8e5362659e63f4b75a4046c5b71ee0992 [diff] |
Merge "resolve merge conflicts of a24fcf6abc to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp