Merge "Change service data and manufacturer data to be repeated." into lmp-dev

author Wei Wang <weiwa@google.com>

Fri, 1 Aug 2014 20:29:54 +0000 (20:29 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Fri, 1 Aug 2014 13:51:29 +0000 (13:51 +0000)
author Wei Wang <weiwa@google.com>
Fri, 1 Aug 2014 20:29:54 +0000 (20:29 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 1 Aug 2014 13:51:29 +0000 (13:51 +0000)
diff --cc src/com/android/bluetooth/gatt/AdvertiseManager.java
Simple merge
author	Wei Wang <weiwa@google.com>
	Fri, 1 Aug 2014 20:29:54 +0000 (20:29 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 1 Aug 2014 13:51:29 +0000 (13:51 +0000)