tree b8dcc32f9709e977498f80f0ac785ad6491a1bac
parent f31d497f9c26109ec39f8c6070bdc480f8aecfb5
parent 5afa4c6b44d4857fc5be60784ffce116e80291b4
author Andrew Lee <anwlee@google.com> 1415405500 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415405500 +0000

am ccbb7447: Merge "Grey out merge button after it is clicked." into lmp-mr1-dev

* commit 'ccbb7447ec8d4c3895f365d6c33d3ab950a20e49':
  Grey out merge button after it is clicked.