OSDN Git Service

resolved conflicts for merge of 7ca13deb to master
authorJake Hamby <jhamby@google.com>
Thu, 9 Jun 2011 06:20:09 +0000 (23:20 -0700)
committerJake Hamby <jhamby@google.com>
Thu, 9 Jun 2011 06:20:09 +0000 (23:20 -0700)
commit1b32c3b4733c36ecb214b9e55b8cbebc4ccc1031
tree713706e3b687bb494c536ef68d1314634302de9f
parenta87feb93390d1957cf4dea26d21741d098a865f3
parente121cd7408841b9aa776c3c11071043d9e5ab652
resolved conflicts for merge of 7ca13deb to master

Change-Id: If34814d6c70cf63eca9bd816845389f6785518ae