Merge "Make DataSourceFactory singleton" am: a59adc1fe3
am: 3df032c97f

Change-Id: I4fc9abb08ea8009465716c78cd9af575e0097495
tree: 4e32ef20709c2c92d554faf3495641e30d36d69e
  1. doc/
  2. include/
  3. src/
  4. tests/
  5. tools/
  6. Android.bp
  7. OWNERS