tree 10f13134c53afc056fbd2a76c2ea4aa2dac86b11
parent 382d8606869c777fedc570494dfe6a698e5a1edd
parent 6075170b838bfe7a040bbff25c2c22859b7d6ee5
author Dharmesh Mokani <mokani@google.com> 1407528163 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1407528163 +0000

am 6075170b: Changes corresponding to framework changes.

* commit '6075170b838bfe7a040bbff25c2c22859b7d6ee5':
  Changes corresponding to framework changes.