am ecff92d9: resolved conflicts for merge of 79a55d35 to klp-ub-dev
am ecff92d9: resolved conflicts for merge of 79a55d35 to klp-ub-dev

* commit 'ecff92d9f7d58b619465259213d7a58ae01c2872':
  add Analytics event to track sample downloads (for real this time)

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build