OSDN Git Service

Merge "resolved conflicts for merge of 61bb25f2 to master"
authorEric Laurent <elaurent@google.com>
Thu, 11 Feb 2010 19:16:36 +0000 (11:16 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 11 Feb 2010 19:16:36 +0000 (11:16 -0800)
commit42481bcbb5ecf733282a0c6477fada06a02b877b
tree6aa618e7e43f355a5e7cd1e48f33e4a6e0652de7
parentec44978757b2f983c9cb9befb31c3bb85e819227
parent72b44cf07401cb6137b98042ff990780fbe2f03f
Merge "resolved conflicts for merge of 61bb25f2 to master"