tree bd369106fd5b5075ee91144602f5836e27bc340c
parent 7ff086fdff9734854fb96e15be15f87e1b3515fd
parent da3b8a493a30db25dbd5a6513d79b8077df29e49
author Esteban Talavera <etalavera@google.com> 1408638015 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408638015 +0000

am ff3bcbf8: am 3e02b271: Merge "Updated documentation for setScreenCaptureDisabled()" into lmp-dev

* commit 'ff3bcbf8134faf2dfddf26bf00afd90c462e9699':
  Updated documentation for setScreenCaptureDisabled()