OSDN Git Service

Merge commit 'bf7dcd2a' into oc-dr1-dev-plus-aosp
authorNathan Harold <nharold@google.com>
Tue, 27 Jun 2017 08:35:04 +0000 (01:35 -0700)
committerNathan Harold <nharold@google.com>
Tue, 27 Jun 2017 08:35:04 +0000 (01:35 -0700)
Change-Id: Ic64fbf4782e129e15f0edbe2db810e81b04acd82


Trivial merge