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)
commit22cd53384c344c2ea53f21f5bb079dff888e4602
tree29b09759d8d48191bfe977537588ec37e0696c95
parent6a688ca1add03a888c0e80d358f29455bbdf82c7
parent277bd4235efd6ddb85a0078d82a5b283bd84f2e3
Merge changes from topic 'net-sync-aosp-with-stage-aosp' into stage-aosp-master
am: 277bd4235e

Change-Id: I02efb8229026eb6ddfbf10bf72645dea10a4215f