OSDN Git Service

Merge "Follow framework API changes"
authorAdam Powell <adamp@google.com>
Wed, 3 Aug 2011 01:45:24 +0000 (18:45 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 3 Aug 2011 01:45:24 +0000 (18:45 -0700)

Trivial merge