tree 90f5783cfb28c095791d752be5b39474bf3485c2
parent 93eb42683e939c790f2d31c43100ab79e283fdb7
parent 2fc87a7338d34d8d7383eeea3a367893961a6ac5
author Andy Huibers <andyhuibers@google.com> 1395815133 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1395815133 -0700

am 2fc87a73: Merge "Clean up stats stubs." into gb-ub-photos-denali

* commit '2fc87a7338d34d8d7383eeea3a367893961a6ac5':
  Clean up stats stubs.