OSDN Git Service

Merge "DO NOT MERGE" into gingerbread
authorShimeng (Simon) Wang <swang@google.com>
Fri, 15 Oct 2010 22:17:22 +0000 (15:17 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 15 Oct 2010 22:17:22 +0000 (15:17 -0700)
commit7ef6834eea24e56d6eba3aac7069e9e0981451d7
tree6a000058be819b5ee4854c6cdd8b26289b841fa6
parentb04f356d86eec74217fca8e3b85d801c4fcaa678
parentbf9cf4d80dd45ac0938c3ba698dc348fbc4290d7
Merge "DO NOT MERGE" into gingerbread