OSDN Git Service

Merge "These files had an older header."
authorDan Bornstein <danfuzz@android.com>
Wed, 8 Dec 2010 00:18:02 +0000 (16:18 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 8 Dec 2010 00:18:02 +0000 (16:18 -0800)

Trivial merge