| commit | 88873ae1b01208a9e70b80860274f429d08a6c64 | [log] [tgz] |
|---|---|---|
| author | Jean-Michel Trivi <jmtrivi@google.com> | Thu Jan 29 20:34:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 20:34:33 2015 +0000 |
| tree | e65a0e3199208d53cf149757174f1e523bc9e0a3 | |
| parent | 183a0e52ac3130501c417005f6363eeec62c0afd [diff] | |
| parent | f1121d963b51c798ab28c85eeff1eedc9bb2c186 [diff] |
am f1121d96: am 0d84ba3f: Merge "Fix FLAG_BEACON regression" into lmp-mr1-dev * commit 'f1121d963b51c798ab28c85eeff1eedc9bb2c186': Fix FLAG_BEACON regression