OSDN Git Service

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

Change-Id: I03bdbb9fc8ceb6a7180b93c29b1d63b4fd471820