OSDN Git Service

Merge changes from topic 'layer-wp-race' into oc-dev am: a17b14eb92
authorChia-I Wu <olv@google.com>
Sat, 17 Jun 2017 02:01:00 +0000 (02:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 17 Jun 2017 02:01:00 +0000 (02:01 +0000)
am: c35a5e29f3

Change-Id: I590c8667049be99f407972953c41ff88e555bb2a


Trivial merge