OSDN Git Service

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

Change-Id: Ib6bd14e80c44dd3e918fd229d37169710fe3d96e


Trivial merge