tree fc7a2ad04c3dc97c92f31c6e109df3dcc3fef1a9
parent 4185d61ecf1221caa6a5b5db8bba0c0f1bc73fb0
parent cd7a2402efc74d6d676b1966464307bb58907321
author Yigit Boyar <yboyar@google.com> 1524166739 -0700
committer Yigit Boyar <yboyar@google.com> 1524166808 -0700

resolve merge conflicts of cd7a2402efc74d6d676b1966464307bb58907321 to pi-preview1-androidx-dev

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic1c98cd8a0b515de9dcdce73030d4082116c7404