tree 559d2bbdf4c4a06a751aa03f0c5f683dd36e5bc0
parent 9cd60f3feb3bdf001c19bbb2040ce8d53d5ba9a8
parent d4cc1b30f3fedc4a39a283f3eed65a7cb852b950
author Yigit Boyar <yboyar@google.com> 1522353779 -0700
committer Yigit Boyar <yboyar@google.com> 1522353873 -0700

git commit -m "resolve merge conflicts of d4cc1b30f3fedc4a39a283f3eed65a7cb852b950 to pi-preview1-androidx-dev

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I458e291f2d077b3e3c48ef09598716a2c71b67de