tree 25da1a26df7ef641fd664282c72e5b85f6c162cb
parent 875cfd20f41b6e405f75fe4a9f9e848d63a67e28
parent 88873ae1b01208a9e70b80860274f429d08a6c64
author Jean-Michel Trivi <jmtrivi@google.com> 1422565062 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422565062 +0000

am 88873ae1: am f1121d96: am 0d84ba3f: Merge "Fix FLAG_BEACON regression" into lmp-mr1-dev

* commit '88873ae1b01208a9e70b80860274f429d08a6c64':
  Fix FLAG_BEACON regression