| commit | 5dd6699c3d6d65b300593dff9d16275a8f4933ae | [log] [tgz] |
|---|---|---|
| author | Wei Liu <luciferleo@google.com> | Thu Nov 03 17:42:02 2016 -0700 |
| committer | Wei Liu <luciferleo@google.com> | Thu Nov 03 17:43:47 2016 -0700 |
| tree | 8da48ff15a88510970b87788af57cf05eb141904 | |
| parent | a8aa8b84cc5fe5e5f71f28f1dcce468f26c7a4e7 [diff] |
Fix the build breakage caused by a bad merge resolution. Change-Id: I2977d9f73d04298738d9c0aa08458278dddc5e31