OSDN Git Service

Merge "cherry-pick from master: c096a9aead60717fc106ceb259bf954a578d3c54 (plus other...
authorScott Main <smain@google.com>
Fri, 16 Apr 2010 23:14:33 +0000 (16:14 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 16 Apr 2010 23:14:33 +0000 (16:14 -0700)

Trivial merge