tree a37acc9b3b0285a2f2cc458e5724494da69a4261
parent 63876d765a3ff5111e49900a1e09e68ff6880485
parent b87edb00dc973f7afd46d1a8d2b6015d245335f3
author Tao Bao <tbao@google.com> 1507224500 +0000
committer android-build-merger <android-build-merger@google.com> 1507224500 +0000

Merge "Revert "Move error_code.h into otautil."" am: b23d29642d
am: b87edb00dc

Change-Id: I43d041f1f59766066240f6e535f1b9839e783c25