OSDN Git Service

Merge changes I1eaab5ea,I42928da8
authorHugo Benichi <hugobenichi@google.com>
Wed, 11 Jan 2017 01:14:10 +0000 (01:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Jan 2017 01:14:10 +0000 (01:14 +0000)
am: b1e3c8aaf4

Change-Id: I744394de40b72744ac60f3d6c2a138c6e876ee28


Trivial merge