OSDN Git Service

Fix for bad merge between ag/2455811 and ag/3424187
authorEugene Susla <eugenesusla@google.com>
Fri, 12 Jan 2018 00:02:22 +0000 (16:02 -0800)
committerEugene Susla <eugenesusla@google.com>
Fri, 12 Jan 2018 00:03:34 +0000 (16:03 -0800)
commitc9f5091a2ce5d3b8d76e9fa53d9847f07b972df2
tree37ea030e59e5817f207b36f6657be86ff2d8263e
parentfbcf2f4cdb7bec8c0d079bc8067c50d44d97d2d0
Fix for bad merge between ag/2455811 and ag/3424187

Test: presubmit
Change-Id: Ib0b5d54cf94e2998eeb661fc57e9d0bfb2e1afdc
core/java/android/view/View.java