tree fb4c36edfc1fd105794afe08743d95d34b2a5a25
parent 3b8e22ea2f6fa7d407942833099de8a83c0f4774
parent bcab5c484efde6a2b2fd6c01ee1c51a1695b5fe3
author Alan Viverette <alanv@google.com> 1400721110 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1400721110 +0000

Merge "Update highlight attribute"