OSDN Git Service

Merge changes from topic 'am-d53708499f7e48cdb8a7bb84c3076b88' into oc-dev-plus-aosp
authorLorenzo Colitti <lorenzo@google.com>
Fri, 26 May 2017 01:10:24 +0000 (01:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 May 2017 01:10:24 +0000 (01:10 +0000)
commit10c0b80844037ec9b20e517df5f93cc29432680a
treee39a6b838c1e8f3e37c028728c6bee63b7282305
parent7f0542b41be7ac128903452660b6ddc10d97720a
parent5fcfca0cba49623f594a1cfc67b3407cd52ef46c
Merge changes from topic 'am-d53708499f7e48cdb8a7bb84c3076b88' into oc-dev-plus-aosp
am: 5fcfca0cba  -s ours

Change-Id: Ia18a65bca3874b030ff4d5f97e11865a1f42f18a