OSDN Git Service

Merge changes I751520a1,I5762e815 am: 42eb0b2555
authorDan Albert <danalbert@google.com>
Wed, 2 Nov 2016 20:00:52 +0000 (20:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 2 Nov 2016 20:00:52 +0000 (20:00 +0000)
am: e3d863cb8d

Change-Id: I3051d7abaf6545324ffedc1da4fdab6c5a8a7849


Trivial merge