OSDN Git Service

Merge changes Idfd8ac9f,I3dacb78f am: 244d105f68
authorJeff Hao <jeffhao@google.com>
Wed, 31 Aug 2016 20:18:46 +0000 (20:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 31 Aug 2016 20:18:46 +0000 (20:18 +0000)
am: 801d035a29

Change-Id: Ieccbf2646bc95a61dae9b4c27083ff6aa549174f


Trivial merge