tree 32f0aa2fb44059a6e8ea60ac5699f7f076138280
parent ae30a316a18c312e25d425324ff46e381289d219
parent f54184103752367effa16868643aec56fe19e01b
author Tao Bao <tbao@google.com> 1506707940 +0000
committer android-build-merger <android-build-merger@google.com> 1506707940 +0000

Merge "otafault: Clean up header inclusion." am: d9373cf621 am: ffc171c56d
am: f541841037

Change-Id: I971fa3c8d5b7d3546df65c1dda98b90c5530f704