OSDN Git Service

Merge changes I660ddce6,Ic58d0481,I5d45aa72
authorDan Albert <danalbert@google.com>
Mon, 7 Nov 2016 19:19:45 +0000 (19:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 7 Nov 2016 19:19:45 +0000 (19:19 +0000)
am: 2560a2703d

Change-Id: Icc4bc065ea2257c1745a6740f3f9271a1fa791bc


Trivial merge