tree e7017e53a27491f43f3a12b04e5d35c7d08950d3
parent 24f1314c6952d3485ce2249497f3957c4a01f6a6
parent ee995106d8a50b691e65988f5b3df5d2d83ca69a
author Sunny Goyal <sunnygoyal@google.com> 1425602690 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425602690 +0000

am ee995106: Some parameter cleanup

* commit 'ee995106d8a50b691e65988f5b3df5d2d83ca69a':
  Some parameter cleanup