OSDN Git Service

Merge "revert 3 sliao changes to fix build"
authorDoug Zongker <dougz@android.com>
Tue, 23 Feb 2010 01:21:04 +0000 (17:21 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 23 Feb 2010 01:21:04 +0000 (17:21 -0800)

Trivial merge