tree 91ac17701e21133ed93b87ebde0d14b48a95cd57
parent b04645260dd4b19d22ec6098dc7ae51b012bb2f6
parent 671e9ea90eb85e1a993ff2d56e02d1014a1b8f39
author Wei Wang <weiwa@google.com> 1413241532 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413241532 +0000

am 671e9ea9: Merge "Add support of advertising through standard instance.(2/4)" into lmp-sprout-dev

* commit '671e9ea90eb85e1a993ff2d56e02d1014a1b8f39':
  Add support of advertising through standard instance.(2/4)