| commit | b840785100e220e5fbe2963ace5e4a65cac919ee | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 14 09:59:39 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Sep 14 09:59:39 2017 +0000 |
| tree | ccf45a713bcf125830b8d4595f5ba1b86eeb30c6 | |
| parent | 3a321910fad57de04874aec8db146d7679664801 [diff] | |
| parent | 8f4eab2fccbc333604f1d248dac9a736db96bc6b [diff] |
Merge "resolve merge conflicts of eb8a4ef5d344 to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp