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)
commit89802da0747385eb326d71417965290450228576
treeee09af12eabf4828965318be321b11c449b1f082
parent31e1c3366ad1be6e63bc5291112e0c8ac5f159b6
parent520e705bf860f048836546a524db3b33af06a38a
am 520e705b: Merge "Whoops, we were counting everything twice in the totals. :("

* commit '520e705bf860f048836546a524db3b33af06a38a':
  Whoops, we were counting everything twice in the totals. :(