OSDN Git Service

Merge changes Ie6777e2b,Iaed834be
authorDimitry Ivanov <dimitry@google.com>
Wed, 5 Oct 2016 16:24:35 +0000 (16:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Oct 2016 16:24:35 +0000 (16:24 +0000)
am: e35872605b

Change-Id: I29f7da2e449d0182aef7cbd123355c3868619c39


Trivial merge