OSDN Git Service

Merge changes from topic 'am-3c32cf60aa7d4143a4aec89ba3f5325d' into oc-dev-plus-aosp
authorNick Kralevich <nnk@google.com>
Tue, 23 May 2017 01:58:46 +0000 (01:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 May 2017 01:58:46 +0000 (01:58 +0000)
commit29a3a7931c217003d852155691c10019a892725a
tree9f7a41b473602234db9b9f47c8954fdd761091c0
parent7993195124d31a1ab9a5b0bdbe888514967d11ec
parent58fa4b99ad5a2d66fbd461a03ddc0443d153296b
Merge changes from topic 'am-3c32cf60aa7d4143a4aec89ba3f5325d' into oc-dev-plus-aosp
am: 58fa4b99ad

Change-Id: Ifcd69cc5b3b8f8494aca2e8b2d2916f2e1a4b154