GitLab

Change-Id: I47f28c64a6ff69326f5dc30e0923ae38b80b9798

Change-Id: Ic1411514a4d43aea57342b842481e6071eb971de

Change-Id: I5a21c3e0f13c46d44e4fcc09641c7e8c1589975c

Change-Id: Ia535bd364786e64b483d3cbe16aab99dd999ac00

Change-Id: I2054ce889310ba549e6f24204ba8bcf3c6cf830e

Change-Id: Ic44096b59794016a3566aa5d67809e55a6f71212

Merge commit '48ab24c9'

* commit '48ab24c9':
  android-2.1_r1 snapshot

Merge commit 'd7e672ad' into eclair-plus-aosp

* commit 'd7e672ad':
  android-2.1_r1 snapshot

Bug: #2361749.

The build system does not honor user tags on apps,
and setting it is misleading.

This removes the confusion by making the makefiles
behave like they read.

Change-Id: I3c2497eb7d2d524f17796c2c1c5cf4e3047e0422

When Alpha string is NULL, blank screen should not be displayed
for SEND SHORT MESSAGE proactive command.

GCF Testcase UMTS SIM/USIM 27.22.4.10.1 SEND SHORT MESSAGE - SEQ 1.7

am 66f9843d: am d517689f: Send OK in terminal response if command specifies user response is not needed.

Merge commit '66f9843d'

* commit '66f9843d':
  Send OK in terminal response if command specifies user response is not needed.

Merge commit 'd517689f' into eclair-mr2-plus-aosp

* commit 'd517689f':
  Send OK in terminal response if command specifies user response is not needed.

GCF Testcase GCF-PTCRB SAT/USAT 27.22.4.1.1seq1.5 expects OK if the command
qualifier specifies no user response is required. Send OK instead of
NO_RESPONSE_FROM_USER when userClear field is set to false.

Merge commit 'cf0f1d7e'

* commit 'cf0f1d7e':
  eclair snapshot

Merge commit 'goog/stage-korg-master' into HEAD

Merge commit 'b85f61e5'

* commit 'b85f61e5':
  Import revised translations.  DO NOT MERGE

Merge commit 'c6137e7c' into eclair-mr2

* commit 'c6137e7c':
  Import revised translations.  DO NOT MERGE

Approver: jerryw

Change-Id: I94beefc588ddb670199106c4656fe522d30f9a67

Merge commit '62acae4b'

* commit '62acae4b':
  Handle null intent in StkAppService.

Bug 2151421. The onStart() may be passed a null intent if a service is restarted and it need handle the null intent for now.

Merge commit '141ed3f0'

* commit '141ed3f0':
  Import revised translations.  DO NOT MERGE

Merge commit '90cdbb6e'

* commit '90cdbb6e':
  Import revised translations.  DO NOT MERGE

Merge commit 'a1cec929'

* commit 'a1cec929':
  Import new translations