OSDN Git Service

Merge changes I6a2f4df7,I62e108bd,Icd83a5ef
authorDan Albert <danalbert@google.com>
Wed, 5 Oct 2016 20:37:09 +0000 (20:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Oct 2016 20:37:09 +0000 (20:37 +0000)
am: 900da7b14a

Change-Id: I8d50ffcdaff60b51a81c0648a0087d645e99ee1d


Trivial merge