OSDN Git Service

Merge changes Ib81bd82d,I9a57fca0
authorDan Albert <danalbert@google.com>
Fri, 9 Sep 2016 00:02:50 +0000 (00:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Sep 2016 00:02:50 +0000 (00:02 +0000)
am: 247f318951

Change-Id: Ida1e741039ffcf58d15c9745eefa1f86ec378eb7


Trivial merge