OSDN Git Service

Merge "Whoops, we were counting everything twice in the totals. :("
authorDianne Hackborn <hackbod@google.com>
Fri, 17 Jan 2014 00:21:21 +0000 (00:21 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 17 Jan 2014 00:21:22 +0000 (00:21 +0000)
commit520e705bf860f048836546a524db3b33af06a38a
treedbfbd4f92d125924334f6fbf36fb11a641f1a8ed
parentbdbb065a1d04d6304ffebef1f914958c9dac6945
parentae19a06e030e55b4db3cb20f1e564d49a78a395e
Merge "Whoops, we were counting everything twice in the totals. :("