tree 49a5697c8f1fc0632c3aa448f9c913a0be296753
parent 5f9defe3f2519865ff9bbc3ae1be405f51d6aab1
parent ffc171c56d4056c1f8b8bb6b352a14924ff4f949
author Tao Bao <tbao@google.com> 1506703605 +0000
committer android-build-merger <android-build-merger@google.com> 1506703605 +0000

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

Change-Id: Ib5d0676a143629c0151ad5e94052b67e2f626f49