OSDN Git Service

Merge changes I9d06ea8a,I2d157024
authorDan Albert <danalbert@google.com>
Wed, 15 Feb 2017 19:24:02 +0000 (19:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 15 Feb 2017 19:24:02 +0000 (19:24 +0000)
commitcec0e2f9b1c2a56443818eee16e50d9866df4efd
tree27dd5ef42c128c4c8dca99f48b0f96ac58f0ac44
parent0a4fb394c8ce5a615eb19a7b8552e7d9448a9c5f
parent606ba2762e6d1062a2cbf4599b7bdb60ce5cc404
Merge changes I9d06ea8a,I2d157024
am: 606ba2762e

Change-Id: I85a709298e33ee2475db2e4af2312b7c9ae93e12