GitLab

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

Merge commit '27fbe1c1'

* commit '27fbe1c1':
  AI 149721: Import Portuguese translations.

Merge commit 'b1eb9c44' into donut

* commit 'b1eb9c44':
  AI 149721: Import Portuguese translations.

Automated import of CL 149721

Merge commit '79085fcc'

* commit '79085fcc':
  Cleanup whitespace.