OSDN Git Service

am 2f205d54: basic activated support
authorJohn Reck <jreck@google.com>
Wed, 13 Mar 2013 00:02:10 +0000 (17:02 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 13 Mar 2013 00:02:10 +0000 (17:02 -0700)
* commit '2f205d54c88ea3f6b1a1a0630201fdb10b0689e2':
  basic activated support


Trivial merge