OSDN Git Service

Merge "fix breakage caused by recent automerge"
authorFreeman Ng <tenorslowworm@google.com>
Wed, 8 Jun 2011 21:35:18 +0000 (14:35 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 8 Jun 2011 21:35:18 +0000 (14:35 -0700)
commit1bc2f0c9956de7bfeb86b5071c5e01940164533a
treea10c65ebe433fe970cba494f4e28c95a0ebcb01e
parent3a5764a4bfc5dc3368bc9becde73db664a2b1c23
parent4412e88e83099323a49e63f9544abd3294091f03
Merge "fix breakage caused by recent automerge"