tree 2c7cbf3fb81da3026478954e7c5cfe3ecda4c3a4
parent 6d13bc8e3b1cf0dac56590a0a76e9da4a1ecab75
parent 6bf513d32db7fbc157681bd642e12a201cf20a89
author Wei Wang <weiwa@google.com> 1406924991 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1406900404 +0000

Merge "Revert "Revert "Service data and manufacturer data can be repeated fields.""" into lmp-dev