tree 304cfd46eecdc511a4b3760314d252db949dad41
parent 82d11c847e25fab56f2841bcd622f8f971edc5db
parent 61a826eff10c4b275a9569a0edd6301924a6d4e7
author Adam Powell <adamp@google.com> 1366321842 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366321842 -0700

am 61a826ef: am 70e37696: Merge "Fix ActionBar#setHomeActionContentDescription(0)" into jb-mr2-dev

* commit '61a826eff10c4b275a9569a0edd6301924a6d4e7':
  Fix ActionBar#setHomeActionContentDescription(0)