| commit | c4ccbd7b2d69930a399ce5f66c54b2fc080d37db | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Sat Sep 30 00:57:51 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sat Sep 30 00:57:51 2017 +0000 |
| tree | 82afa467b14897d0686e6f753b03302fa126d434 | |
| parent | fc3b294c3f226acf1f53e0162c5aafab951df3a7 [diff] | |
| parent | ee6855cca71ee2ba01e8afa16ee21a0a6ef524e7 [diff] |
Merge "resolve merge conflicts of 73d9596bc to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp