OSDN Git Service

Merge changes Id749f453,Ie3ce9dd8
authorColin Cross <ccross@android.com>
Tue, 20 Sep 2016 16:56:43 +0000 (16:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Sep 2016 16:56:43 +0000 (16:56 +0000)
commit4484a40288768a7bf08a97151714c529eedf8005
tree90e5cbf706d6507769d365b2e4004306ed4e9b67
parent734fad9a115e3f6a637fb1d2c1c6aa8a0627fffe
parent48d10ee126838f060aa6dcd304fc161b57bc14af
Merge changes Id749f453,Ie3ce9dd8
am: 48d10ee126

Change-Id: I2eb81d725df21938a73b280a742db45a1ee85f86