| commit | f689441eede0c60a11541ad0f03621ea948ad441 | [log] [tgz] |
|---|---|---|
| author | Alexey Polyudov <apolyudov@google.com> | Thu Feb 02 12:59:34 2017 -0800 |
| committer | Alexey Polyudov <apolyudov@google.com> | Thu Feb 02 21:58:36 2017 +0000 |
| tree | b2e401743ef8d9da22f826501fa0e39d80632070 | |
| parent | 40046d43168a38d0f69fa41a80c52b0c6794c86c [diff] |
fix the build breakage caused by merge resolution commit 5d409ace19fa1d8d14d099c63f04ba45e4d578a8 broke the build Change-Id: I62f55d8c1d023190af5171864998a2a4b2090a37 Signed-off-by: Alexey Polyudov <apolyudov@google.com> (cherry picked from commit 8c041f786200bed1050e8155aa620c02ab5db5cf)