OSDN Git Service

am 05f5437a: am 5ee17505: Changes to deal with restrictions API change
authorAmith Yamasani <yamasani@google.com>
Wed, 17 Apr 2013 18:34:29 +0000 (11:34 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 17 Apr 2013 18:34:29 +0000 (11:34 -0700)
* commit '05f5437af1d7a6fa5ca27f9cadef0521c05ae09d':
  Changes to deal with restrictions API change


Trivial merge