tree 7f5f05346183140b1dc3e2957ac3426358a198c9
parent 6de331a349aa5ac7badd32255ed00b57c43e4e94
parent c35a5e29f3c4c05041ac0f4a0bcbfe669d3d67bc
author Chia-I Wu <olv@google.com> 1497664860 +0000
committer android-build-merger <android-build-merger@google.com> 1497664860 +0000

Merge changes from topic 'layer-wp-race' into oc-dev am: a17b14eb92
am: c35a5e29f3

Change-Id: I590c8667049be99f407972953c41ff88e555bb2a