OSDN Git Service

[automerger skipped] Merge changes from topic "vpn_data_accounting" am: 6c93e5378a...
authorVarun Anand <vaanand@google.com>
Fri, 29 Mar 2019 01:25:59 +0000 (18:25 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 29 Mar 2019 01:25:59 +0000 (18:25 -0700)
commit1bf4cace33b2a6eeb38c8b5ae3e5d99d8d1614b3
treeb8453ec45ab09a0e9c69b6706151c078de7e89ea
parentae9f6953adeb8f69bc095df3b84c9937d331dd11
parent112b8bd6c5b9556d0658cda720604b3ce54f8a68
[automerger skipped] Merge changes from topic "vpn_data_accounting" am: 6c93e5378a am: 09ef7691f5
am: 112b8bd6c5 -s ours
am skip reason: change_id I230c1edbf64cfeb3dbb560db368b5e420f7b79a4 with SHA1 e62e287511 is in history

Change-Id: I193b9d8190a4cda863d89d9babb680201fa3f125