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)
commit3f736c96f9273540889e540c7ad0474aa2d6aeda
treebb8819642c406973156976ccde649407927dea05
parent281f9c5cf01723b7bbf69ec023f64ba46c6df36e
parenta6222b5306aba445c9173f7ed26662644f047b71
Merge "These files had an older header."