| commit | 0d8e3e9405b55dbc70257e9f4e4f0682ce1def54 | [log] [tgz] |
|---|---|---|
| author | Alexey Polyudov <apolyudov@google.com> | Thu Feb 02 21:01:49 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Feb 02 21:01:50 2017 +0000 |
| tree | 94a632c904fb69e61b2571c1dae92aba83b65f1f | |
| parent | 23eb4378d61c48a6fd67df76bf3c85ca97fa006e [diff] | |
| parent | 8c041f786200bed1050e8155aa620c02ab5db5cf [diff] |
Merge "fix the build breakage cuased by merge resolution"