OSDN Git Service

Merge changes I23e6f088,I800208e8,I55123a7a into oc-dr1-dev
authorDan Stoza <stoza@google.com>
Fri, 14 Jul 2017 20:45:47 +0000 (20:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Jul 2017 20:45:47 +0000 (20:45 +0000)
am: 607b5d1b40

Change-Id: I51b25a25bae1517f64edf9ce072244addd1b3544


Trivial merge