OSDN Git Service

Merge changes from topic 'chooser' into oc-dev
authorIan Lake <ilake@google.com>
Wed, 19 Apr 2017 21:40:52 +0000 (21:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Apr 2017 21:40:52 +0000 (21:40 +0000)
commit4d0f44d7a75424d9d16921520d21c72af83282ec
tree4aae8c9d4649cfaf750b3c9130977c51d8f25e97
parentd85e60aa467b6acee006bd14d5f8fe1b6cb5273f
parent28602c0921c8937b1a0d160d8df316bd15a4b846
Merge changes from topic 'chooser' into oc-dev
am: 28602c0921

Change-Id: Ica1b9bf1acc23c89439c4c4adf7c998ee4372c96