OSDN Git Service

Merge changes I6ff80178,I03875cf1,I8d210b68 am: 5d942c1352
authorJeremy Joslin <jjoslin@google.com>
Thu, 19 Jan 2017 23:14:33 +0000 (23:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 Jan 2017 23:14:33 +0000 (23:14 +0000)
am: f5e4912fa2

Change-Id: I97104593be351ea75fa5307b9bcc0904b406c27b


Trivial merge