Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,037 Commits 3 Branches 0 Tags
813d974e33366aaeeb54e242e2767d4eeaf940dc
Commit Graph

177037 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ruben Brunk
5cef9f8f3f am fb7c14c5: am 41af9d59: Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev automerge: d2ccbd4 
* commit 'fb7c14c5f974cad8b74e51cc8fab86c276626780':
 2015-02-13 01:39:42 +00:00
Ruben Brunk
ff475c0ea7 Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev automerge: d2ccbd4 
automerge: 41af9d5

* commit '41af9d592efbae88ed95ab77a856dd4e8fbab998':
  camera2: Fix legacy scaling factor application.
 2015-02-13 01:36:13 +00:00
Ruben Brunk
fb7c14c5f9 am 41af9d59: Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev automerge: d2ccbd4 
* commit '41af9d592efbae88ed95ab77a856dd4e8fbab998':
  camera2: Fix legacy scaling factor application.
 2015-02-13 01:33:42 +00:00
Ruben Brunk
41af9d592e Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev 
automerge: d2ccbd4

* commit 'd2ccbd43d24a79122e404206c528995600a6507d':
  camera2: Fix legacy scaling factor application.
 2015-02-13 01:28:23 +00:00
Ruben Brunk
d2ccbd43d2 Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev 2015-02-13 01:22:26 +00:00
Andrew Solovay
c860242cc1 docs: Noted that purchaseToken is long and cannot be truncated. 
Noted in reference and integration doc that the token for Google Play
purchases may be up to 1,000 chars long, and the entire token must
be returned (not abbreviated or truncated) to any method that needs
it.

See first comment for doc stage location.

bug: 19099521
Change-Id: I0a0f187293ea522c218f6c3287b4c36ee6725a90
 2015-02-12 17:05:43 -08:00
Luan Nguyen
15ebb4daab am 96a99bc3: am b9f9408c: am 474746c7: am 2ea209ab: am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs automerge: fe2c687 
* commit '96a99bc3c1f57298c551254fcb8854410ff4e53f':
  docs: Update device art generator to include Wear generic devices.
 2015-02-13 00:33:29 +00:00
Luan Nguyen
4317ab134b am 86391a2f: am b967f720: am 71cf2b6d: am e726495a: am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs automerge: e0306bb 
* commit '86391a2f63d60513279481e02c7234367cbced85':
  docs: Fix issue with onCreate() method declaration in file backup section
 2015-02-13 00:33:24 +00:00
Luan Nguyen
968db3619a am b8f9e048: am e88f3522: am b14aec1b: am b6de0316: am e1f90b4e: Merge "docs: Fix notification api guide issues (7461154, 12765600)" into lmp-docs automerge: 946bf2d 
* commit 'b8f9e04867aefe3b2f8fba05664c652f12bedc18':
  docs: Fix notification api guide issues (7461154, 12765600)
 2015-02-13 00:33:18 +00:00
Luan Nguyen
96a99bc3c1 am b9f9408c: am 474746c7: am 2ea209ab: am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs automerge: fe2c687 
* commit 'b9f9408c22ca95913643a60bac34bda07aa44173':
  docs: Update device art generator to include Wear generic devices.
 2015-02-13 00:25:26 +00:00
Luan Nguyen
86391a2f63 am b967f720: am 71cf2b6d: am e726495a: am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs automerge: e0306bb 
* commit 'b967f7201a42227a359412441cadc13b42a348ef':
  docs: Fix issue with onCreate() method declaration in file backup section
 2015-02-13 00:25:23 +00:00
Luan Nguyen
b8f9e04867 am e88f3522: am b14aec1b: am b6de0316: am e1f90b4e: Merge "docs: Fix notification api guide issues (7461154, 12765600)" into lmp-docs automerge: 946bf2d 
* commit 'e88f352264714dd394731a01dcadbb67c1665be6':
  docs: Fix notification api guide issues (7461154, 12765600)
 2015-02-13 00:25:19 +00:00
Luan Nguyen
b9f9408c22 am 474746c7: am 2ea209ab: am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs automerge: fe2c687 
* commit '474746c7b08842cefecc9c1408c7837d93cff823':
  docs: Update device art generator to include Wear generic devices.
 2015-02-13 00:19:29 +00:00
Luan Nguyen
b967f7201a am 71cf2b6d: am e726495a: am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs automerge: e0306bb 
* commit '71cf2b6d5344a45413f0c77691d7e1efb18b398f':
  docs: Fix issue with onCreate() method declaration in file backup section
 2015-02-13 00:19:25 +00:00
Luan Nguyen
e88f352264 am b14aec1b: am b6de0316: am e1f90b4e: Merge "docs: Fix notification api guide issues (7461154, 12765600)" into lmp-docs automerge: 946bf2d 
* commit 'b14aec1b954f6fea5fc3ead9a289c8896f372096':
  docs: Fix notification api guide issues (7461154, 12765600)
 2015-02-13 00:19:20 +00:00
Luan Nguyen
474746c7b0 am 2ea209ab: am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs 
automerge: fe2c687

* commit 'fe2c687b97f21b7dd5471279c1b2b9458dcd22bf':
  docs: Update device art generator to include Wear generic devices.
 2015-02-13 00:16:48 +00:00
Luan Nguyen
71cf2b6d53 am e726495a: am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs 
automerge: e0306bb

* commit 'e0306bbece4fd32d1e2f837dc515506180e04e8e':
  docs: Fix issue with onCreate() method declaration in file backup section
 2015-02-13 00:15:09 +00:00
Luan Nguyen
b14aec1b95 am b6de0316: am e1f90b4e: Merge "docs: Fix notification api guide issues (7461154, 12765600)" into lmp-docs 
automerge: 946bf2d

* commit '946bf2de30545a548022b8b8ba1b0ebc890ab08e':
  docs: Fix notification api guide issues (7461154, 12765600)
 2015-02-13 00:13:35 +00:00
Casey Burkhardt
d1a5b5dc07 am 6f2dd8a9: Merge "Support circular magnification frame on circular devices" into lmp-mr1-modular-dev 
* commit '6f2dd8a9b195a2bc8538820d8685a4a0576964f9':
  Support circular magnification frame on circular devices
 2015-02-12 23:28:30 +00:00
Casey Burkhardt
6f2dd8a9b1 Merge "Support circular magnification frame on circular devices" into lmp-mr1-modular-dev 2015-02-12 23:23:45 +00:00
Geoff Mendal
6c02d92398 am 77c5de0d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit '77c5de0d68fb1e40e01082cf97758b2d35bfca91':
  Import translations. DO NOT MERGE
 2015-02-12 23:22:42 +00:00
Geoff Mendal
f6ee5dbc5e am fabfcfd9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit 'fabfcfd97e37b1cc194fa0e9f6db3268e1a2ae43':
  Import translations. DO NOT MERGE
 2015-02-12 23:22:38 +00:00
Geoff Mendal
77c5de0d68 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 23:16:49 +00:00
Geoff Mendal
fabfcfd97e Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 23:16:37 +00:00
John Spurlock
1be4b702f5 am 7e7c91ec: am e4049b6d: am f45e5dbf: Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev 
* commit '7e7c91ec95eca5e1089ede9953f27d8c3d3b8bea':
  NoMan: Initialize filter value reported to listeners.
 2015-02-12 23:11:36 +00:00
Geoff Mendal
16070689f0 Import translations. DO NOT MERGE 
Change-Id: I536dd9e059bc42c5c399539e62d8aed02c9e446a
Auto-generated-cl: translation import
 2015-02-12 15:06:15 -08:00
Geoff Mendal
5a2b966ac4 am e22cd0f9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit 'e22cd0f9e6da18fe6827a481774e2998efbb5f46':
  Import translations. DO NOT MERGE
 2015-02-12 23:05:28 +00:00
John Spurlock
7e7c91ec95 am e4049b6d: am f45e5dbf: Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev 
* commit 'e4049b6d36ded6ec808be5f884248772a4059a72':
  NoMan: Initialize filter value reported to listeners.
 2015-02-12 23:05:25 +00:00
Geoff Mendal
cd15d99721 am dfe8fe3f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit 'dfe8fe3fcf551386d6107b67bc348d88207979c3':
  Import translations. DO NOT MERGE
 2015-02-12 23:05:23 +00:00
Geoff Mendal
682cec120e am 39b03e76: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit '39b03e76365d1da92de51da3bd9f7677c7b16af8':
  Import translations. DO NOT MERGE
 2015-02-12 23:05:18 +00:00
Geoff Mendal
8a18ac3d85 am 7c958e2d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit '7c958e2df0375761a1851cd02ca3aac3ee95f1c5':
  Import translations. DO NOT MERGE
 2015-02-12 23:05:13 +00:00
Geoff Mendal
f23a517add am dc43cc88: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit 'dc43cc88f02bde0917525e9fe274453bc000eb0a':
  Import translations. DO NOT MERGE
 2015-02-12 23:05:08 +00:00
Geoff Mendal
df45d644b6 am 5c7e4d99: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit '5c7e4d99402bf0440ebd6713b6680f8abea175a3':
  Import translations. DO NOT MERGE
 2015-02-12 23:05:04 +00:00
Geoff Mendal
a01f5457bc am be5aa9dd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit 'be5aa9dda325a29c3f34cb9a97958c63f120f15e':
  Import translations. DO NOT MERGE
 2015-02-12 23:04:59 +00:00
Geoff Mendal
14720e7a38 am 6113edf5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit '6113edf578bba44de85698624026b4f48652fef9':
  Import translations. DO NOT MERGE
 2015-02-12 23:04:54 +00:00
Geoff Mendal
5e5c39abdb Import translations. DO NOT MERGE 
Change-Id: I57a4ac857f18a1e365e79198ac5de60748847add
Auto-generated-cl: translation import
 2015-02-12 15:04:27 -08:00
Geoff Mendal
e22cd0f9e6 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 23:01:29 +00:00
Geoff Mendal
dfe8fe3fcf Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 23:01:18 +00:00
Geoff Mendal
39b03e7636 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 23:00:58 +00:00
Geoff Mendal
7c958e2df0 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 23:00:46 +00:00
Geoff Mendal
dc43cc88f0 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 23:00:17 +00:00
Geoff Mendal
5c7e4d9940 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 22:59:58 +00:00
Geoff Mendal
be5aa9dda3 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 22:59:25 +00:00
Geoff Mendal
6113edf578 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 22:58:47 +00:00
John Spurlock
e4049b6d36 am f45e5dbf: Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev 
* commit 'f45e5dbf599a0043d7f6576f20eafb2c1c157204':
  NoMan: Initialize filter value reported to listeners.
 2015-02-12 22:58:44 +00:00
Geoff Mendal
dd1048e10a Import translations. DO NOT MERGE 
Change-Id: I592c996ee5bd1d20bcd4ea595b3e6cbba08a4d0c
Auto-generated-cl: translation import
 2015-02-12 14:55:57 -08:00
Geoff Mendal
0804199a6e Import translations. DO NOT MERGE 
Change-Id: Ia9e245c983da6b04f3098269e611d1e193899be8
Auto-generated-cl: translation import
 2015-02-12 14:53:58 -08:00
John Spurlock
f45e5dbf59 Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev 2015-02-12 22:52:13 +00:00
Geoff Mendal
b008c8f73a Import translations. DO NOT MERGE 
Change-Id: I44a5695c1b18476df2114f16e35fbcbf2a0d99c1
Auto-generated-cl: translation import
 2015-02-12 14:51:47 -08:00
Geoff Mendal
899b20e374 Import translations. DO NOT MERGE 
Change-Id: Ic17d83f48e83832042cd417f1196e6f108ad1724
Auto-generated-cl: translation import
 2015-02-12 14:46:15 -08:00