tree 3c07dad3c442542864b7a728991013141567e934
parent f0d14afa61649e9ff0b21c67620d3db66fe0ca73
parent f8e7cbffb9de3f16d1ee4329190a0423c2319545
author Winson Chung <winsonc@google.com> 1493662399 +0000
committer android-build-merger <android-build-merger@google.com> 1493662399 +0000

Merge "Ensure that the action views are always updated." into oc-dev
am: f8e7cbffb9

Change-Id: I00b603c3bcc4da09d95e1feb8d80bac2626b6b26