tree e1bdd253640ed3f2fdf488b347356bd472e3094a
parent a61fc1b565ab5e60bd02e15cb09081fb6cbfb6da
parent 1dd351180a97f2d59a75762b97fff8f8160ed9ae
author Yorke Lee <yorkelee@google.com> 1436545920 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436545920 +0000

am c061fd29: Merge "Fix for glowpad not showing when dialing out + call waiting" into mnc-dev

* commit 'c061fd29439f96e4c577778451006f33d1ee3d5d':
  Fix for glowpad not showing when dialing out + call waiting