| commit | 3732ed29e3d9bebafbea353e9d8d3f27be3d2884 | [log] [tgz] |
|---|---|---|
| author | Michael Wright <michaelwr@google.com> | Fri May 05 12:11:16 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri May 05 12:11:21 2017 +0000 |
| tree | 46c95642cac926eaaae26d01ca986b0691bcfd21 | |
| parent | 84bb0ecd1dff028ab0900ca44d86989ca3d65782 [diff] | |
| parent | 731a7f38a9949bb9d15f9dd16514e7908c84ed9e [diff] |
Merge "Remove line from bad resolution merge." into oc-dev-plus-aosp