tree f84617513594474bba4b581062728e9c16bf80b8
parent 96555a00f85dd620ab2e0fd04e733cc60fcd3a12
parent 77fe4c96b75550e5d22a294314b05beabd55e97a
author Vinit Deshpande <vinitd@google.com> 1416435698 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416435698 +0000

am 77fe4c96: am a34f3d30: am 800bf3ae: Merge "Fix WPS docs for LABEL method" into lmp-mr1-dev

* commit '77fe4c96b75550e5d22a294314b05beabd55e97a':
  Fix WPS docs for LABEL method