tree e9c654ed7567ae953e684e3b472f8f12b466c209
parent 33ff3ff6a1a7c6a88bdcc0a19fcf77c8499ba1e2
parent 7d2309c06787d20bafe9582e1f47d106b624ab59
author Yuichi Araki <yaraki@google.com> 1527033588 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1527033588 +0000

Merge "Fix flaking DataSourceFactoryTest" into pi-preview1-androidx-dev