OSDN Git Service

Merge "Synchronize access to ServiceDeclaration fields. am: f8ecbbb am: a37273e"...
authorCalvin On <con@google.com>
Fri, 22 Apr 2016 22:15:36 +0000 (22:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Apr 2016 22:15:36 +0000 (22:15 +0000)
commita73f7ac84dbe79af9df90c3d7f0d5da7ab814ba1
tree1348ae26ba989a8cf4ea4520d18e9345bc0e6f4a
parentc26b62d46ad1ce1b956297b5c2f6331391849fa0
parent50f1562e1f348d576ed8230dab82616f857ae2aa
Merge "Synchronize access to ServiceDeclaration fields. am: f8ecbbb am: a37273e" into nyc-mr1-dev-plus-aosp
am: 50f1562

* commit '50f1562e1f348d576ed8230dab82616f857ae2aa':

Change-Id: I71d7b8ec09dce9d59552fbabf0ccd4081eaa768b