commit | f1121d963b51c798ab28c85eeff1eedc9bb2c186 | [log] [tgz] |
---|---|---|
author | Jean-Michel Trivi <jmtrivi@google.com> | Thu Jan 29 20:29:40 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 20:29:40 2015 +0000 |
tree | 6242a784e02b2001232ef67593cd9aabb5606c3b | |
parent | ce25d85ad22e6df4b861d17e9e67cb6d0e62c363 [diff] | |
parent | 0d84ba3fd82038cb721ffae234a99e6751ed7fbe [diff] |
am 0d84ba3f: Merge "Fix FLAG_BEACON regression" into lmp-mr1-dev * commit '0d84ba3fd82038cb721ffae234a99e6751ed7fbe': Fix FLAG_BEACON regression