tree d132a8af04dd065ee1aad3773d7117c478676b38
parent 64bf3951c5bf215e25c87672912935291d342e2a
parent 3787b722495d8effffc3cc63e5db8052476a5558
author Tao Bao <tbao@google.com> 1507760015 +0000
committer android-build-merger <android-build-merger@google.com> 1507760015 +0000

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

Change-Id: I12d4ae254e42b11a45472b6addff98a1128c87d8