tree 134cfca0d94da2924c04243bb856abf91e77618c
parent f7772bafa95eb09b0bb140658236afcdb8524aad
parent a27f973999636a30c98f9db7a24752a0c9605e87
author Tao Bao <tbao@google.com> 1507758220 +0000
committer android-build-merger <android-build-merger@google.com> 1507758220 +0000

Merge "otafault: Add the missing #include <string>." am: 489155c44b am: 9e232f9f2a
am: a27f973999

Change-Id: I621bde6eec31ba01d0680cda2184334773323a11