| commit | 1bc2f0c9956de7bfeb86b5071c5e01940164533a | [log] [tgz] |
|---|---|---|
| author | Freeman Ng <tenorslowworm@google.com> | Wed Jun 08 14:35:18 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jun 08 14:35:18 2011 -0700 |
| tree | a10c65ebe433fe970cba494f4e28c95a0ebcb01e | |
| parent | 3a5764a4bfc5dc3368bc9becde73db664a2b1c23 [diff] | |
| parent | 4412e88e83099323a49e63f9544abd3294091f03 [diff] |
Merge "fix breakage caused by recent automerge"