OSDN Git Service

Merge changes Iefdc1662,I8ee9ce62
authorDan Albert <danalbert@google.com>
Tue, 23 May 2017 00:53:37 +0000 (00:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 May 2017 00:53:37 +0000 (00:53 +0000)
am: 7bbe7cb619

Change-Id: Idbf3b079085e13ce59592ae435e9cf72aefc0f90


Trivial merge