GitLab

* commit '1b0c9c95':
  Ensure install-during-restore is like install-then-restore

* commit '81c1d8d3':
  Ensure install-during-restore is like install-then-restore

When we've installed an apk from the archive, recheck whether
to apply the system-uid policy restrictions around file system
restores.

Bug 8833099

(cherry picked from commit 2baf6dcf)

Change-Id: I972fe1543f2234aa76baf562d6f806175ac0248e

* commit 'f3a5323c':
  libdrm: fix bad strncpy / snprintf calls

* commit '6d8f5b75':
  libdrm: fix bad strncpy / snprintf calls

Fix the following bugs reported by IOActive:
* GOOGLE-AN01 - Android libdrm drm_parseDM.c Boundary-CRLF Buffer Overflow
* GOOGLE-AN02 - Android libdrm 'drm_parseDM.c' contentType-CRLF Buffer Overflow
* GOOGLE-AN03 - Android libdrm drm_parseDM.c contentID-CRLF Buffer Overflow
* GOOGLE-AN04 - Android libdrm 'parser_dcf.c' Multiple Headers Buffer Overflow
* GOOGLE-AN05 - Android libdrm 'parser_dcf.c' ContentType Buffer Overflow

Bug: 8727221

(cherry picked from commit 25619b2c)

Change-Id: I9a99c9b8a63c8b9efb3b2b650c735467b77120f2

Change-Id: I8e947fd20783ed12d46807733c4a87ba61211e41

Change-Id: Iee793b5fbb39e551c0df39ba4aeac40b55fb16d6

Bug: 6923539

Skipping the change. We already fixed this in master and jb-mr2-dev
in sha: 2905e18b. A compatible change
was submitted to jb-dev (and so automerged to jb-mr1-dev). see sha
7918cf4e. The conflict occurs while
merging 8237dd82 which I thought was
DO NOT MERGE anyway.

Change-Id: If96e368d2e2cec98bc18069151a2ff861b53608f

Change-Id: I79e93efb6adab6bc010379f66d0434afcb0fcf4f

Change-Id: I54298c010183a112776065ec894611d5de5f1cc1

Change-Id: I0339c0d3853467da435654940d0c55a31139b736

* commit '9d47e7b6':
  DO NOT MERGE Add a delimiter between scheme and host

* commit '679c8f68':
  Revert "Add a delimiter between scheme and host"

Add a delimiter between scheme and host

Bug: 6923539
Change-Id: Ic5e19f96c64367c9dc0e3168850309cdd5047e47

Change-Id: I9fab8f29515e086feffd45bcbcf9e7d6602a734d

Change-Id: Iade088d20bc483fb65aabd85cb049b21188edf64

* commit '93c39d5d':
  DO NOT MERGE Fix issues during backport

Fix issues related to I219accd5db0c8a0e64b8aab3b049a8cee7dc168f.

Change-Id: Iacf72a9c618d59601c373de948a3f7cbfcbd7038

* commit '7918cf4e':
  DO NOT MERGE Add a delimiter between scheme and host

* commit '38915fd4':
  Revert "Add a delimiter between scheme and host"

Bug: 6923539
Change-Id: I219accd5db0c8a0e64b8aab3b049a8cee7dc168f

This reverts commit aa2163dd

Change-Id: I19e98182e97b8e81cabe3ff09897b82d50ce968e

* commit 'aa2163dd':
  Add a delimiter between scheme and host

Bug: 6923539
Change-Id: I49aac145e8e80a5af7475cfe93ef4a353d2d3fe6

* commit '7b3ac9ad':
  Validate restored file paths against their nominal domain

* commit '0cb27e28':
  Validate restored file paths against their nominal domain

Bug 8460775

(cherry picked from commit 7323765b)

Change-Id: I6710503799a6df2de142a827513d5b4c107b6ec9

Change-Id: I4de9f2a9ef18415225e1c85d53602bbaacbb7bb6

There's a typo in the "Authenticating to OAuth2 Services" training
class, under "Request an Auth Token... Again" (#RequestAgain).

The call to result.get() will fail, because AccountManagerFuture
doesn't support this method. Instead, getResult() needs to be
called first.

Change-Id: Ia25b9364cd14180cf7ddac50057a2ec03e01ed1f

bug: 8278024

Change-Id: Ia401ed1c2e7ce12052db217265a1a420c44ffe78

Merge "cherrypick from Change-Id: I6615e7036dce48e46f6a2b284046219d8237de5f dashboard update for 4/4/13" into jb-mr1-dev

dashboard update for 4/4/13

Change-Id: I04903c2c7ef56f6bef39a9e01fcce386d26e4763

* commit 'bb2aa63b':
  Tighten enforcement of file modes.