OSDN Git Service

Merge "Store up to 5 network log batches if needed." into oc-dev am: 52e5e75313
authorPavel Grafov <pgrafov@google.com>
Tue, 28 Mar 2017 17:36:41 +0000 (17:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 28 Mar 2017 17:36:41 +0000 (17:36 +0000)
am: 4d52068836  -s ours

Change-Id: I82a1bffd2e06df2d91e32a06d9feea0f99e5457e


Trivial merge