OSDN Git Service

Merge changes I2198f8b5,I245c859e
authorMark Salyzyn <salyzyn@google.com>
Tue, 29 Nov 2016 17:50:14 +0000 (17:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 29 Nov 2016 17:50:14 +0000 (17:50 +0000)
am: c3fbd8b936

Change-Id: I8a765ad6d12ea8450fba6f229e564b0a40007c15


Trivial merge