| commit | e0eaf67f9266e6794e4b60cde19a6ca2c78c2d01 | [log] [tgz] |
|---|---|---|
| author | Alexey Polyudov <apolyudov@google.com> | Thu Feb 02 22:06:52 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Feb 02 22:06:52 2017 +0000 |
| tree | 94a632c904fb69e61b2571c1dae92aba83b65f1f | |
| parent | 0d8e3e9405b55dbc70257e9f4e4f0682ce1def54 [diff] | |
| parent | f689441eede0c60a11541ad0f03621ea948ad441 [diff] |
fix the build breakage caused by merge resolution am: f689441eed Change-Id: I1e62efcdb09b82c61f864470d8a5c8079832d74e