OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ec854b9 d34ff0e)
am 61e6c1e0: am 1d5fcf03: Merge "Service data and manufacturer data can be repeated...
authorWei Wang <weiwa@google.com>
Fri, 1 Aug 2014 13:50:59 +0000 (13:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 1 Aug 2014 13:50:59 +0000 (13:50 +0000)
* commit '61e6c1e0b859352974a3ca58d1633e09525154b1':
  Service data and manufacturer data can be repeated fields.


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help