OSDN Git Service

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

Change-Id: I3e3dfd52a6aa687cf7a18997448e7d25bc6a57ff


Trivial merge