OSDN Git Service

Merge "Roy West's fix is stuck in auto-merger"
authorRoy West <rwest@google.com>
Thu, 27 Jan 2011 04:49:25 +0000 (20:49 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 27 Jan 2011 04:49:25 +0000 (20:49 -0800)
commit0dcdcd76ef13aa3847f725e7179ce4e7d270db35
treeee80337d96d24f93601da1222d08ce8296a58273
parent91f5593452c614934fc25d5140530f9eb90aba88
parentc73982cd819a8c097c57c7fa1d938f48fbbefc4d
Merge "Roy West's fix is stuck in auto-merger"