tree b8c1549829d01b50e461befdb06655046dcd6136
parent 15f088a2e62c0fa71a44fe3f4b2f4c25f82bf0a8
parent 9387e5cd618bbb69ae72417c1811408b017eacf3
author Tianjie Xu <xunchang@google.com> 1565921455 -0700
committer android-build-merger <android-build-merger@google.com> 1565921455 -0700

Merge "Remove common.h" am: 899f7b5105 am: 03fd851f61
am: 9387e5cd61

Change-Id: Ia6abd2750228e98662f04b241489285b7dcb9eb5