OSDN Git Service

am ccb277ef: am b0e25f71: Merge "Follow API changes in framework." into jb-mr1-dev
authorJeff Sharkey <jsharkey@android.com>
Wed, 3 Oct 2012 02:07:30 +0000 (19:07 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 3 Oct 2012 02:07:30 +0000 (19:07 -0700)
commit9f396f52ee73e983fbe876c99f7ccc7d0ff7d43b
treee472d2bdc64a3daafe75adfb31c22a0dab968f90
parentef1048d588d4c05420063b6b01b8f2fd20a6a5c9
parentccb277ef37f79d48c120e5860d831cc468ae1b9a
am ccb277ef: am b0e25f71: Merge "Follow API changes in framework." into jb-mr1-dev

* commit 'ccb277ef37f79d48c120e5860d831cc468ae1b9a':
  Follow API changes in framework.