OSDN Git Service

Merge changes I4c0e7fdd,I9ea3827a
authorPaul Duffin <paulduffin@google.com>
Fri, 12 May 2017 12:51:25 +0000 (12:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 May 2017 12:51:25 +0000 (12:51 +0000)
commit557996e1d0cb3c49d7625f7793a7aa4db93042bf
treece3dda075621b590d5bbadeea785a1e34ad9bf92
parent1d274ca5eccdd8cff62ddbc213b456793b0ce72f
parentc876eece687f0dd14dfba25b1a3de1e5745003d9
Merge changes I4c0e7fdd,I9ea3827a
am: c876eece68

Change-Id: Idf7bfe0bf3d9a770772bd364b9c6d1a9db6d9cdf