tree e23f6891685ee290dccc5d6225db4676e5eee587
parent 0a3159e1f316b416809eab504c938aecc28ea338
parent 0ccfb84ac95f2903f1c1365a593119559e9e5acb
author Yigit Boyar <yboyar@google.com> 1521159228 +0000
committer android-build-merger <android-build-merger@google.com> 1521159228 +0000

Merge "Add convenience converters to DataSource.Factory" into oc-mr1-jetpack-dev
am: 0ccfb84ac9

Change-Id: Iccb682eb321c811956804a6b7c33104c37ad7336