OSDN Git Service

Merge changes from topic 'o-usage64-2' into oc-dev
authorChris Forbes <chrisforbes@google.com>
Tue, 25 Apr 2017 04:18:30 +0000 (04:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 25 Apr 2017 04:18:30 +0000 (04:18 +0000)
am: 441c1cb7d7

Change-Id: Ia157cdb20c55ed30f3b6de49be3b67b3410910d0


Trivial merge