| commit | aae036391b83a4509f2f480f36a1a4974b05132d | [log] [tgz] |
|---|---|---|
| author | Jean-Michel Trivi <jmtrivi@google.com> | Thu Jan 29 20:57:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 20:57:42 2015 +0000 |
| tree | 25da1a26df7ef641fd664282c72e5b85f6c162cb | |
| parent | 875cfd20f41b6e405f75fe4a9f9e848d63a67e28 [diff] | |
| parent | 88873ae1b01208a9e70b80860274f429d08a6c64 [diff] |
am 88873ae1: am f1121d96: am 0d84ba3f: Merge "Fix FLAG_BEACON regression" into lmp-mr1-dev * commit '88873ae1b01208a9e70b80860274f429d08a6c64': Fix FLAG_BEACON regression