OSDN Git Service

Merge commit 'e45e328821ba' into oc-dev-plus-aosp
authorNathan Harold <nharold@google.com>
Thu, 30 Mar 2017 00:15:17 +0000 (00:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 30 Mar 2017 00:15:17 +0000 (00:15 +0000)
commit9c87dfece96b605cfe313e2dd8c9c49fc73754e8
treea43e9fda0af3212c43c7d03a72f5bdfe1effdfb4
parentc7802c2c010558bfd14daf676c6dc721fdae1d93
parent560c9ec724bdebc31a35a934a703cd802e0926f4
Merge commit 'e45e328821ba' into oc-dev-plus-aosp
am: 560c9ec724

Change-Id: I136c31aa5b27a3520c93141d91d6198e2dae3a1d