OSDN Git Service

Merge "resolved conflicts for merge of 998a929a to master"
authorAndreas Huber <andih@google.com>
Wed, 30 Nov 2011 00:31:17 +0000 (16:31 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 30 Nov 2011 00:31:17 +0000 (16:31 -0800)
commitd2041b810e94b83549d60ffb6d125fddf32f8eb4
tree12628ec22bf1f54d78253b347e3e94b3ad8f0d20
parent0c66eb20fc5f148288b08218bcc3715baa54d974
parent1371ecced58ebea8b03468a8ea0df1de0984bf9f
Merge "resolved conflicts for merge of 998a929a to master"