OSDN Git Service

Merge "Squashed commit of the following:"
authorAndreas Huber <andih@google.com>
Fri, 29 Oct 2010 20:45:41 +0000 (13:45 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 29 Oct 2010 20:45:41 +0000 (13:45 -0700)
commit5afb316c8c6b5747cab544c1ae66ba16252b62fa
tree207fb32006870bd67f06cb8dd8f4bddbac777ef9
parent069dffdf27031e10ebd437d04924a07add71d9de
parent69b8d69aadbf0e795f1a1e1adc82c78cf0b9959f
Merge "Squashed commit of the following:"