OSDN Git Service

Merge "Fix for badly rebased current.xml"
authorAdam Powell <adamp@google.com>
Sat, 6 Mar 2010 02:54:38 +0000 (18:54 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 6 Mar 2010 02:54:38 +0000 (18:54 -0800)

Trivial merge