tree 21ee6d810687657a99967f0f8dc2ef886b8c5ba7
parent c9bc881fc7c33f377cc934abd6ed3bb46ffb0f6e
parent ea7a70528f83ca36ab6a35e013b2fbf478c352ec
author Etan Cohen <etancohen@google.com> 1394559833 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394559833 +0000

am ea7a7052: am 70b1f88b: Merge "[USSD] Consolidate USSD messages in a single dialog box" into klp-dev

* commit 'ea7a70528f83ca36ab6a35e013b2fbf478c352ec':
  [USSD] Consolidate USSD messages in a single dialog box