GitLab

am: 718278e9

* commit '718278e9':

am d8f6253e: Merge "When ensuring screen exists, make sure it\'s actually referring to a screen, not a rank" into ub-now-porkchop am: cb20616a am: 86b4730b
am: 278d4d2d

* commit '278d4d2d':

am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am: 6317598a  -s ours am: bfe43479  -s ours
am: 669ef65a  -s ours

* commit '669ef65a':

am: 2f22fa89

* commit '2f22fa89':

am d8f6253e: Merge "When ensuring screen exists, make sure it\'s actually referring to a screen, not a rank" into ub-now-porkchop am: cb20616a
am: 86b4730b

* commit '86b4730b':

am 68207e25: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop am: 6317598a  -s ours
am: bfe43479  -s ours

* commit 'bfe43479':

am: 50141452

* commit '50141452':

am d8f6253e: Merge "When ensuring screen exists, make sure it\'s actually referring to a screen, not a rank" into ub-now-porkchop
am: cb20616a

* commit 'cb20616a':

am: 6317598a  -s ours

* commit '6317598a':

* commit 'aae99eaa':
  fix build
  fix build

* commit 'b2b58c8f':
  fix build
  fix build

* commit '729ad90f':
  Import translations. DO NOT MERGE

Change-Id: Ibdacd9febbe2e1d8a282af7a856d27fbffb1014c
Auto-generated-cl: translation import

* commit '875cdbd2':
  Import translations. DO NOT MERGE

Change-Id: I2287d714cc1f58f409083c256fa4431dc1e4a918
Auto-generated-cl: translation import

- You don't need to explicitly specify protobuf library; The library
  name has been changed and the build system automatically adds it.
- You can't have a file target $(LOCAL_BUILT_MODULE) depend on phony target
  launcher_protoutil_lib.
- "include $(call all-makefiles-under,$(LOCAL_PATH))" must be on the
  last line.

(cherry picked from commit 3d74c663)

Change-Id: I27d967a57d6a9373da50821af32191614a3c8bc7

The dependency here can be removed because it it automatically added
when LOCAL_PROTOC_OPTIMIZE_TYPE=nano by
build/core/host_java_library_common.mk.

Change-Id: I949d32fb5126f1c05e2a6ed48f6636a4a9b15a48

Change-Id: I87e768fc95738358eddcca9b524d7546ed632e4b

Bug: 18040469
Change-Id: I24db4d3f4b7ee10ecf5a2c65035ce112271539fb

Bug: 18040469
Change-Id: I2938c7b950470eeacfb20391f109ae44d95060c7

Change-Id: I5afb7119527734723b3bd4e35e66844b62f74d95
Auto-generated-cl: translation import

Bug 18554839

Change-Id: I43f391b7cc376f697ce7b5b363e8be3aa85814b5

* commit 'd2285942':
  Ignoring specific db exception DO NOT MERGE

Bug 18554839.

Change-Id: I80f2dd62297eea671f2d129ae22263e72e506ae4
(cherry picked from commit 5f05913f)

* commit '268b8907':
  Ensure that FirstFrameAnimatorHelper doesn't set play time when animation is complete

Bug: 18567716

Change-Id: I656e869b8553d650916c2abe6dc83282c8b6fd65
(cherry picked from commit 5c18b80e)

Change-Id: If32589149a2b776b668510662360e04aa66ade88
Auto-generated-cl: translation import

Bug: 18571789,18535867
Change-Id: I2544fa634879846d812b00f8649520400f66d29e

Bug: 18567716

Change-Id: I656e869b8553d650916c2abe6dc83282c8b6fd65

Change-Id: I80f2dd62297eea671f2d129ae22263e72e506ae4

Added a static utility function to get the DeviceProfile instead.

Bug: 18504164
Change-Id: Ia510a84f1c195e58acf3bf4d1f6a42c739fdd413

Change-Id: I0d7a075387e2ba2c8b9607620ae1d1197cf5cd99
Auto-generated-cl: translation import