tree 5ed082448d3c01a8f51770e33c4df35d9ac29d62
parent 2af828790b261fdf9a57fa80fb6ea6415fef88ee
parent 4d62456e211a0b4cd77a8967417340612994cb6c
author Scott Main <smain@google.com> 1349308256 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349308256 -0700

am 4d62456e: resolved conflicts for merge of f15f8a1b to jb-dev

* commit '4d62456e211a0b4cd77a8967417340612994cb6c':
  add analytics event tracking for Design downloads, SDK downloads, Badges and Device art.