OSDN Git Service

am 6075170b: Changes corresponding to framework changes.
authorDharmesh Mokani <mokani@google.com>
Fri, 8 Aug 2014 20:02:43 +0000 (20:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 8 Aug 2014 20:02:43 +0000 (20:02 +0000)
* commit '6075170b838bfe7a040bbff25c2c22859b7d6ee5':
  Changes corresponding to framework changes.


Trivial merge