OSDN Git Service

Merge changes If9d1da45,I6daecb52
authorVladimir Marko <vmarko@google.com>
Tue, 22 Nov 2016 15:05:45 +0000 (15:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Nov 2016 15:05:45 +0000 (15:05 +0000)
am: 701bb7d1d7

Change-Id: I2f916d2ca886544bb8ea466be8ed4ff9b3e83261


Trivial merge