OSDN Git Service

am b0e25f71: Merge "Follow API changes in framework." into jb-mr1-dev
authorJeff Sharkey <jsharkey@android.com>
Wed, 3 Oct 2012 02:04:48 +0000 (19:04 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 3 Oct 2012 02:04:48 +0000 (19:04 -0700)
* commit 'b0e25f71a8376c6435212a3ce695f321d0ea828e':
  Follow API changes in framework.


Trivial merge