OSDN Git Service

am ee47e11a: (-s ours) am f6b396da: DO NOT MERGE
authorShimeng (Simon) Wang <swang@google.com>
Mon, 18 Oct 2010 17:30:20 +0000 (10:30 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 18 Oct 2010 17:30:20 +0000 (10:30 -0700)
commit21e501a7c1f2756aafb4a0ce635cc3da3e668b48
tree6f7cb68f8ed90664eaceca5deb1408f71e0ead6a
parent4a9b86e79aab2495037b5321040d10958e569231
parentee47e11a95731328130ec0382054072fbbeb2913
am ee47e11a: (-s ours) am f6b396da: DO NOT MERGE

Merge commit 'ee47e11a95731328130ec0382054072fbbeb2913'

* commit 'ee47e11a95731328130ec0382054072fbbeb2913':
  DO NOT MERGE