tree e87f0b35eb887a21f9f8823d6d2c1956584bf17e
parent 4982e7b4dce8afe2a5490ac6a6630039946b782f
parent e9fd6d29f49e11bdce4d4cb865c04e24fb7b55fa
author Adam Powell <adamp@google.com> 1433206805 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1433206806 +0000

Merge "Don't take the compatibility path for non-primary ActionModes" into mnc-dev