OSDN Git Service

Merge "resolved conflicts for merge of 80adaddf to master"
authorRobert Greenwalt <rgreenwalt@google.com>
Mon, 27 Jun 2011 21:04:16 +0000 (14:04 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 27 Jun 2011 21:04:16 +0000 (14:04 -0700)
commit3d4363b4d84f66bba8153a2ac4afeac7ed064b5c
tree136e0bba2bb8086c7507bcf0d08caf23eb39824e
parent40cd7e0fdbbc7463b6fb367c0d9bf95dec82a13e
parent3c8cc74f81d0f81204bd827076889bb51143dff8
Merge "resolved conflicts for merge of 80adaddf to master"