OSDN Git Service

am 520e705b: Merge "Whoops, we were counting everything twice in the totals. :("
authorDianne Hackborn <hackbod@google.com>
Fri, 17 Jan 2014 01:11:39 +0000 (17:11 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 17 Jan 2014 01:11:39 +0000 (17:11 -0800)
* commit '520e705bf860f048836546a524db3b33af06a38a':
  Whoops, we were counting everything twice in the totals. :(


Trivial merge