OSDN Git Service

Merge changes from topic 'net-sync-aosp-with-stage-aosp' into stage-aosp-master
authorLorenzo Colitti <lorenzo@google.com>
Fri, 27 Jan 2017 07:26:28 +0000 (07:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 27 Jan 2017 07:26:28 +0000 (07:26 +0000)
am: 277bd4235e

Change-Id: I02efb8229026eb6ddfbf10bf72645dea10a4215f


Trivial merge