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

* commit 'f2fbb21de204519877eaf58e2163d9b0da97e0e9':
  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