OSDN Git Service

Merge "resolved conflicts for merge of cfeaa492 to master"
authorDaniel Sandler <dsandler@google.com>
Tue, 1 Mar 2011 02:38:02 +0000 (18:38 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 1 Mar 2011 02:38:02 +0000 (18:38 -0800)
commit5dc9fc2a53ecdf9426e74c513c1a501f975ff7c6
tree539d89ca8a1c9b515416402633c4f1e04738c7b9
parent0b77ea2981e4cc0ad136935ae1ed7856b1282606
parent8ab0c001104d5c9422d1ca351bc1f1d4a14a2ffd
Merge "resolved conflicts for merge of cfeaa492 to master"