OSDN Git Service

Merge changes I2198f8b5,I245c859e am: c3fbd8b936 am: af3938ae34 am: 3d4318fdf6
authorMark Salyzyn <salyzyn@google.com>
Tue, 29 Nov 2016 18:04:17 +0000 (18:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 29 Nov 2016 18:04:17 +0000 (18:04 +0000)
am: b5fee4acfd

Change-Id: I9d16fc734bbde1ebc0547b822e6651dfb6a5363c


Trivial merge