Merge "Import translations. DO NOT MERGE"
merge in jb-mr1-release history after reset to jb-mr1-dev
am 6438bfc0: mako: dhcp: Add CLIENTID request to dhcpcd service

* commit '6438bfc0699baf7aca28d57830d284fd488f4862':
  mako: dhcp: Add CLIENTID request to dhcpcd service
am 59e68307: Merge "Mako: NFC: Enable error logging." into jb-mr1-dev

* commit '59e68307b62e2069e0216709edeebbfb899b7c6f':
  Mako: NFC: Enable error logging.
am a4762adc: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'a4762adc9d80acf52ac62ec9c5379d7ef5009204':
  Import translations. DO NOT MERGE
Revert "mako: disable mdp composition"

This reverts commit 0ab51a174ab68687758eb2f2d8b49b3ded3c618a.

Conflicts:

	CleanSpec.mk

Change-Id: I913179a61406ea2fd4a6520ca723b034c115cdd5
Signed-off-by: Iliyan Malchev <malchev@google.com>
mako: add fast autofocus configuration

Change-Id: I19e5328f763973fd34c1902d2d90640b01a9b625
am d6f02510: mako: add fast autofocus configuration

* commit 'd6f025102afd73ffd62950de8df298060484b78e':
  mako: add fast autofocus configuration
Import translations. DO NOT MERGE

Change-Id: I170a71dede0dfa9afc407c5797db5ac16e1cd9d3
Auto-generated-cl: translation import
Import translations. DO NOT MERGE

Change-Id: I612e28328d8abe30eaaf4d62b2d5824ba57ab2c6
Auto-generated-cl: translation import
Import translations. DO NOT MERGE

Change-Id: I219d2b0d98a9d72c945b1797b097c77d1bb31bba
Auto-generated-cl: translation import
mako: add fast autofocus configuration

Change-Id: I19e5328f763973fd34c1902d2d90640b01a9b625
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
am d6441a6c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'd6441a6c5b09e69e57614afcb0d84f9be7f74d3f':
  Import translations. DO NOT MERGE
Configure mako disable delay time as 1 second
bug 7212447
Change-Id: I709224b050c26079efbccaaceb64a24ce486c07e
Merge "Configure mako disable delay time as 1 second bug 7212447 Change-Id: I709224b050c26079efbccaaceb64a24ce486c07e" into jb-mr1-dev
am df1f9a99: Merge "Configure mako disable delay time as 1 second bug 7212447 Change-Id: I709224b050c26079efbccaaceb64a24ce486c07e" into jb-mr1-dev

* commit 'df1f9a990669e1d3092d296d724fc62d88681d88':
  Configure mako disable delay time as 1 second bug 7212447 Change-Id: I709224b050c26079efbccaaceb64a24ce486c07e
Merge "Revert "mako: disable mdp composition"" into jb-mr1-dev
am d6f02510: mako: add fast autofocus configuration

* commit 'd6f025102afd73ffd62950de8df298060484b78e':
  mako: add fast autofocus configuration