OSDN Git Service

Merge changes I7748934f,I008ef537,I1027e87f
authorColin Cross <ccross@android.com>
Wed, 28 Sep 2016 03:51:56 +0000 (03:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 28 Sep 2016 03:51:56 +0000 (03:51 +0000)
am: 132fb22957

Change-Id: Idb0a92939564554becffe4cfa7209f9c220176e6


Trivial merge