OSDN Git Service

Resolve merge conflicts for merge of 21083066 to master.
authorWink Saville <wink@google.com>
Mon, 2 May 2011 19:13:44 +0000 (12:13 -0700)
committerWink Saville <wink@google.com>
Mon, 2 May 2011 19:13:44 +0000 (12:13 -0700)
commitb2531a836b525c14756c6d1e9f08b149ce693068
treed6fc0766f7c994bf1450c2a02bc25289525a900a
parent3a1c7d260191e7fbfc9739955d8286387184de26
parent745fa56f9aac30d7fdd2abed9299016d5944850f
Resolve merge conflicts for merge of 21083066 to 

Change-Id: Ief83f7abdd3396af965fb86ad6815e16ce36ff5c