GitLab

frameworks/base/voip has been moved to frameworks/opt/net/voip
and is now a library.

Change-Id: I4b17697be2cf6d239b7d80920f10392df8b52be2

# By HardCorePawn
# Via Android Git Automerger (2) and others
* commit 'e66430c1':
  Correcting 2 FC's in Dev Tools

# By HardCorePawn
# Via Android Git Automerger (1) and others
* commit '2e21a7d5':
  Correcting 2 FC's in Dev Tools

# By HardCorePawn
# Via Gerrit Code Review (1) and HardCorePawn (1)
* commit '2f388d7a':
  Correcting 2 FC's in Dev Tools

Added in missing permission required by SyncTester
Commented non-existant Google Login Service

Change-Id: Id00d9fa974d8cb747cebb99c5a64ed5b438b56e9

am 288e1996: am b78b8ccd: am 7f340728: Merge "Fix SDK build: use repository XML schemas from new prebuilts."

* commit '288e1996':
  Fix SDK build: use repository XML schemas from new prebuilts.

* commit 'b78b8ccd':
  Fix SDK build: use repository XML schemas from new prebuilts.

* commit '7f340728':
  Fix SDK build: use repository XML schemas from new prebuilts.

Change-Id: I32799751cb19db2f99b45c26b7e308b1e11af161

Change-Id: I29a56e54ebcac0b951114efdf01f98afd1adb758

am 71459f1f: am fb198383: am 8c013aee: am 690af128: Cherrypick from Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e

* commit '71459f1f':
  Cherrypick from Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e

am fb198383: am 8c013aee: am 690af128: Cherrypick from Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e

* commit 'fb198383':
  Cherrypick from Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e

* commit '8c013aee':
  Cherrypick from Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e

* commit '690af128':
  Cherrypick from Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e

First set of demo apps for DevBytes videos

Change-Id: I696b184aaa8058f01c0369a173aae09e38a8cb08

Change-Id: I4ae984cf776604cede32b98db6b1eb3cb6c59c7e

* Email (back to old-school config until Email2 returns)
* SystemUI_intermediates
* mp4parser

Change-Id: I62f0b153b24368365202400515a4612e1b5ef22c

am fe85cdde: am 79f346a7: am ec5a8473: am b8a61acb: Bitmapfun Sample: Change cache memory calculation to use maxMemory()

* commit 'fe85cdde':
  Bitmapfun Sample: Change cache memory calculation to use maxMemory()

am 79f346a7: am ec5a8473: am b8a61acb: Bitmapfun Sample: Change cache memory calculation to use maxMemory()

* commit '79f346a7':
  Bitmapfun Sample: Change cache memory calculation to use maxMemory()

* commit 'ec5a8473':
  Bitmapfun Sample: Change cache memory calculation to use maxMemory()

* commit 'b8a61acb':
  Bitmapfun Sample: Change cache memory calculation to use maxMemory()

When calculating memory cache size, use Runtime.maxMemory() instead
of getMemoryClass() which is a more accurate value of available VM
heap size.

Also bump target and build SDK to 17.

Bug: 7988323
Change-Id: I4b94688b3800d958ffbe03ee9a2a620982483d3d

* commit 'caf8379a':
  Camera2: Fix segfault when control fields were omitted in metadata: DO NOT MERGE
  Camera2: Test: fix deadlock in isStreamInUse: DO NOT MERGE
  Camera2: Return -ENODEV for camera indices out of bounds: DO NOT MERGE
  Camera2: Turn off 3A when android.control.mode == OFF: DO NOT MERGE

am 8b622fe3: (-s ours) am 10665f4b: Merge "Camera2: Fix a potential race condition in the readout thread: DO NOT MERGE" into jb-mr1-aah-dev

* commit '8b622fe3':
  Camera2: Fix a potential race condition in the readout thread: DO NOT MERGE

am ae6c881b: (-s ours) am 778dd967: Merge "Camera2: Fix a deadlock when closing the camera: DO NOT MERGE" into jb-mr1-aah-dev

* commit 'ae6c881b':
  Camera2: Fix a deadlock when closing the camera: DO NOT MERGE

am 6917606e: (-s ours) am 6daf70b2: Merge "Camera2: Selectively re-define master metadata symbols: DO NOT MERGE" into jb-mr1-aah-dev

* commit '6917606e':
  Camera2: Selectively re-define master metadata symbols: DO NOT MERGE

am 15493fd9: am 784be44a: am a1d11945: am 6acfaccc: Bitmapfun Sample: Fix inSampleSize selection and update dependencies

* commit '15493fd9':
  Bitmapfun Sample: Fix inSampleSize selection and update dependencies

* commit 'd75ec23e':
  Sync stddef.h

* commit '80fc9e53':
  Sync MIPS fenv.h

* commit 'bc8fa78f':
  Fix san-sangeles warnings with clang 3.1

* commit 'ba48d6f0':
  Camera2: Fix segfault when control fields were omitted in metadata: DO NOT MERGE
  Camera2: Test: fix deadlock in isStreamInUse: DO NOT MERGE
  Camera2: Return -ENODEV for camera indices out of bounds: DO NOT MERGE
  Camera2: Turn off 3A when android.control.mode == OFF: DO NOT MERGE

am 10665f4b: Merge "Camera2: Fix a potential race condition in the readout thread: DO NOT MERGE" into jb-mr1-aah-dev

* commit '10665f4b':
  Camera2: Fix a potential race condition in the readout thread: DO NOT MERGE