tree d660719b16f28797e0fd81ac00a7b5f15272781d
parent 6d0fe54d0264c86632cebab36958515d966b44b6
parent e61bd662d982dbda0694318e92dfd228e2921fe0
author Adam Powell <adamp@google.com> 1321285560 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321285560 -0800

am a8743f15: Fix bug 5425280 - Two ActionBar icons show up

* commit 'a8743f152aac4a8ef97c79bdad5232614453ce2a':
  Fix bug 5425280 - Two ActionBar icons show up