OSDN Git Service

resolved conflicts for merge of 3d630e86 to master
authorAndreas Huber <andih@google.com>
Wed, 30 Nov 2011 17:53:40 +0000 (09:53 -0800)
committerAndreas Huber <andih@google.com>
Wed, 30 Nov 2011 17:53:40 +0000 (09:53 -0800)
commit136486defa30f98361e5a464c541e2220976c7e2
tree12628ec22bf1f54d78253b347e3e94b3ad8f0d20
parentb3f9c70faac6394bc43954df7b8fb51bfbaa012a
parent94547b18a9d1ce169938e3adda035af135be36d5
resolved conflicts for merge of 3d630e86 to master

Change-Id: I9eb7b7c1668b5f0de85ec8b1e9257cf1ec4d8b9e