OSDN Git Service

resolved conflicts for merge of 49853dc1 to master
authorDaniel Sandler <dsandler@google.com>
Wed, 2 Mar 2011 20:26:53 +0000 (15:26 -0500)
committerDaniel Sandler <dsandler@google.com>
Wed, 2 Mar 2011 20:26:53 +0000 (15:26 -0500)
commit13b3cf7ac14a608845439abafeaf899465c2b97d
tree729100fd5958e6b210ef0589ad598a5d9797a9d9
parent85f4654319803039a181443ec3ceaf1db9b4cf80
parenta7d25a312fafa06aaec5d3b6eaf43d14da539c04
resolved conflicts for merge of 49853dc1 to master

Change-Id: I0d56965740d1273841e33cfc5db57b4df05915d1