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)
commit3e638a0e7dbfb7c389bd819f014c705a66a83112
treeaad8be5e048750e543e0fd18bea5200ba6a3cf1a
parent3fd09a13f0f534c30ba65a3450685449cc66d387
parent801d035a29bf9e7df87b091ee3eb8b1d39c1450f
Merge changes Idfd8ac9f,I3dacb78f am: 244d105f68
am: 801d035a29

Change-Id: Ieccbf2646bc95a61dae9b4c27083ff6aa549174f