LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,689 Commits 2 Branches 0 Tags
251bb36d7b14cf6cd4ff3a17b1d6ccf2bd49b8f5
Commit Graph

15689 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Konstantinos Menychtas
251bb36d7b am ceef025b: am 5ce76991: am 860c3d7c: am 1bbfccc1: (-s ours) am 0c635c71: am 2d5d97ef: am bc013aa0: (-s ours) am 8de93852: am 6384e218: DO NOT MERGE Increase the system-image revision number after opengl bug fix 
* commit 'ceef025b277b430150d6d3961221472197ab8417':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
 2015-08-07 23:13:19 +00:00
Nick Kralevich
dd48de4dfe am 163341ca: am 89e5f5c1: am c5066d81: am bc7cb7d9: resolved conflicts for merge of 5e69741e to klp-modular-dev 
* commit '163341cac33c69e604db1ee0bffd66bfaab2d2c3':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
 2015-08-07 23:13:17 +00:00
Konstantinos Menychtas
0f528e4f0d am 14c5da2f: resolved conflicts for merge of bbb03147 to lmp-mr1-dev 
* commit '14c5da2f86fd8c59f961e6675eeeb4af299a0e18':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
 2015-08-07 23:13:15 +00:00
Konstantinos Menychtas
ceef025b27 am 5ce76991: am 860c3d7c: am 1bbfccc1: (-s ours) am 0c635c71: am 2d5d97ef: am bc013aa0: (-s ours) am 8de93852: am 6384e218: DO NOT MERGE Increase the system-image revision number after opengl bug fix 
* commit '5ce76991038e5bd2f624055fae71642846bf80e1':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
 2015-08-07 23:07:17 +00:00
Nick Kralevich
163341cac3 am 89e5f5c1: am c5066d81: am bc7cb7d9: resolved conflicts for merge of 5e69741e to klp-modular-dev 
* commit '89e5f5c1cd9d2523de76d69f77e651a07db61446':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
 2015-08-07 23:07:16 +00:00
Konstantinos Menychtas
5ce7699103 am 860c3d7c: am 1bbfccc1: (-s ours) am 0c635c71: am 2d5d97ef: am bc013aa0: (-s ours) am 8de93852: am 6384e218: DO NOT MERGE Increase the system-image revision number after opengl bug fix 
* commit '860c3d7c90d6e0dccfb1129001c5ee8202936bdd':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
 2015-08-07 22:53:37 +00:00
Konstantinos Menychtas
860c3d7c90 am 1bbfccc1: (-s ours) am 0c635c71: am 2d5d97ef: am bc013aa0: (-s ours) am 8de93852: am 6384e218: DO NOT MERGE Increase the system-image revision number after opengl bug fix 
* commit '1bbfccc10cf563e060302d07b5574e8f59ddeda6':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
 2015-08-07 22:45:44 +00:00
Konstantinos Menychtas
1bbfccc10c am 0c635c71: am 2d5d97ef: am bc013aa0: (-s ours) am 8de93852: am 6384e218: DO NOT MERGE Increase the system-image revision number after opengl bug fix 
* commit '0c635c711d7670fcf7c2aaf1ed5f082db40f0ad8':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
 2015-08-07 22:39:16 +00:00
Konstantinos Menychtas
14c5da2f86 resolved conflicts for merge of bbb03147 to lmp-mr1-dev 
Change-Id: If4fe53fed5753076fc4fddb076ed5c4c1f5e9490
 2015-08-07 15:08:07 -07:00
Nick Kralevich
89e5f5c1cd am c5066d81: am bc7cb7d9: resolved conflicts for merge of 5e69741e to klp-modular-dev 
* commit 'c5066d81a85d1c98f3d885d50a65299818a0a60d':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
 2015-08-07 21:18:59 +00:00
Nick Kralevich
c5066d81a8 am bc7cb7d9: resolved conflicts for merge of 5e69741e to klp-modular-dev 
* commit 'bc7cb7d92a768963c50e8f5f27bce07be2804658':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
 2015-08-07 21:12:20 +00:00
Konstantinos Menychtas
bbb0314723 am ac7b67f7: DO NOT MERGE Increase the system-image revision number after opengl bug fix 
* commit 'ac7b67f7b9203306d17b4dd5751c4086ce495ca5':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
 2015-08-07 19:19:01 +00:00
Nick Kralevich
bc7cb7d92a resolved conflicts for merge of 5e69741e to klp-modular-dev 
Change-Id: I6717f689995cafaa38c23bb8f2a64900bcc36004
 2015-08-07 12:00:09 -07:00
Konstantinos Menychtas
0c635c711d am 2d5d97ef: am bc013aa0: (-s ours) am 8de93852: am 6384e218: DO NOT MERGE Increase the system-image revision number after opengl bug fix 
* commit '2d5d97ef42d4bcd72194f61e829dc04cec600a53':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
 2015-08-07 18:58:42 +00:00
Konstantinos Menychtas
2d5d97ef42 am bc013aa0: (-s ours) am 8de93852: am 6384e218: DO NOT MERGE Increase the system-image revision number after opengl bug fix 
* commit 'bc013aa08bf9e561fe7d64e2188aa7ec50c3427c':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
 2015-08-07 18:50:56 +00:00
Konstantinos Menychtas
bc013aa08b am 8de93852: am 6384e218: DO NOT MERGE Increase the system-image revision number after opengl bug fix 
* commit '8de93852b7b4d8dd8c3931cb5f23ca334728f0db':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
 2015-08-07 18:42:41 +00:00
Konstantinos Menychtas
8de93852b7 am 6384e218: DO NOT MERGE Increase the system-image revision number after opengl bug fix 
* commit '6384e2185159c50c48f0ef38313385dc75adf606':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
 2015-08-07 18:31:03 +00:00
Konstantinos Menychtas
5e69741e55 am ff48910f: DO NOT MERGE Increase the system-image revision number after opengl bug fix 
* commit 'ff48910f838c132a5dbf48a584e37d0ffe8d29bb':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
 2015-08-07 18:21:38 +00:00
Konstantinos Menychtas
6bf2b78e70 am fc4964b9: DO NOT MERGE Increase the system-image revision number after opengl bug fix 
* commit 'fc4964b9c3d4f016c06ffa9d6ce7a9b0dbe00a1e':
  DO NOT MERGE Increase the system-image revision number after opengl bug fix
 2015-08-07 18:19:52 +00:00
Konstantinos Menychtas
fc4964b9c3 DO NOT MERGE Increase the system-image revision number after opengl bug fix 
Back-ported bug-fix 5f07d74ad7fb64637cc29405262a9d33fb2f2bff
(opengl: Fix QemuPipeStream::readFully reading beyond end of buffer)
warrants a system image update. This patch increases the revision
number for released images appropriately.

Change-Id: I3c475d2ab7d6702102cb22b602697936eefed19b
 2015-07-21 17:00:13 +00:00
Konstantinos Menychtas
ac7b67f7b9 DO NOT MERGE Increase the system-image revision number after opengl bug fix 
Back-ported bug-fix b6b8deb6abd06f063f546b43b90b1c21028f219c
(opengl: Fix QemuPipeStream::readFully reading beyond end of buffer)
warrants a system image update. This patch increases the revision
number for released images appropriately.

Change-Id: If77312e0441800e9c4d9dbcfc770183ab1a118e9
 2015-07-21 16:59:34 +00:00
Konstantinos Menychtas
ff48910f83 DO NOT MERGE Increase the system-image revision number after opengl bug fix 
Back-ported bug-fix 2098196c82ac1832cfb351950c17ecd4b46bb5a0
(opengl: Fix QemuPipeStream::readFully reading beyond end of buffer)
warrants a system image update. This patch increases the revision
number for released images appropriately.

Change-Id: I80d1c83eff1d0e474315071f9ea6d99c638c9891
 2015-07-21 16:58:59 +00:00
Konstantinos Menychtas
6384e21851 DO NOT MERGE Increase the system-image revision number after opengl bug fix 
Back-ported bug-fix c80bf4e9c5b4233da8478ab820fc54bc1f6a7de6
(opengl: Fix QemuPipeStream::readFully reading beyond end of buffer)
warrants a system image update. This patch increases the revision
number for released images appropriately.

Change-Id: Ice4116aa7cbe15a9e55e38cd6a4b3a92dd608fdc
 2015-07-21 16:58:32 +00:00
Trevor Johns
bc576e3e5d am 13b15893: Update sample browseables 
* commit '13b15893e3804ac8dac72226b6ad9f3478219060':
  Update sample browseables
 2015-04-23 21:56:49 +00:00
Trevor Johns
13b15893e3 Update sample browseables 
Synced to developers/samples/android commit
121d61a3334fd4999d3cb6553f2356eb8893d19b.

Change-Id: I9a8cebc4b0de0e704b1f2172d57a18420cc96b92
 2015-04-22 20:21:37 -07:00
Trevor Johns
eba484fbd4 am 951e7288: Fix browseable category for NfcProvisioning sample 
* commit '951e7288e6bea6ed91f510e3cdefc7110b4de353':
  Fix browseable category for NfcProvisioning sample
 2015-04-02 21:21:24 +00:00
Trevor Johns
951e7288e6 Fix browseable category for NfcProvisioning sample 
Synced with developers/samples/android commit
0a4e12c1bc019a34549c6e88260879e2da49ce7c.

Change-Id: Ia75c0e01ce61679d87ab88e80c6db97006aaa1e0
 2015-04-02 13:29:30 -07:00
Trevor Johns
721cd1b86a am 77b5d394: Update sdk.atree and samples/browseable for lastest samples release 
* commit '77b5d394ff91872896c69f5cee93a126f3aed92e':
  Update sdk.atree and samples/browseable for lastest samples release
 2015-03-30 23:47:14 +00:00
Trevor Johns
77b5d394ff Update sdk.atree and samples/browseable for lastest samples release 
Synced to developers/samples/android commit
97b2cfe5ba6d8fa8daaf3273141b321b5fe9e910.

Change-Id: I360cfa147e71dd519b841df41b4e878f86b9b27b
 2015-03-30 16:06:43 -07:00
Xavier Ducrohet
835221bfd3 am d9e9e60f: Update build tools version to 22.0.2. DO NOT MERGE. 
* commit 'd9e9e60f22109b3c8966a41c25b223f40a3d51f9':
  Update build tools version to 22.0.2. DO NOT MERGE.
 2015-03-27 00:33:32 +00:00
Xavier Ducrohet
d9e9e60f22 Update build tools version to 22.0.2. DO NOT MERGE. 
Change-Id: Icb5bb90fe3b7c31059d97d87ed8e44c0d794236e
 2015-03-23 14:23:54 -07:00
The Android Automerger
dfe61de07e merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-03-20 06:05:16 -07:00
Kris Giesing
818a7473fd Merge "Add demos for GuidedStepFragment." into lmp-mr1-ub-dev 2015-03-19 16:41:24 +00:00
The Android Automerger
3fd959fa74 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-03-18 06:05:34 -07:00
Kris Giesing
bfcde222e9 Add demos for GuidedStepFragment. 
Make the main activity a guided step that allows the selection of
other activities.  Add a dedicated activity to represent a
sequence of GuidedStepFragments.

b/18935698

Change-Id: I16142f4d7e87b3f2f02b812faa9bff82ecf5361c
 2015-03-17 16:36:48 -07:00
Craig Stout
623cfb01dd Merge "Add branding to DetailsFragment and TitleHelper with RowsFragment." into lmp-mr1-ub-dev 2015-03-17 19:47:08 +00:00
Craig Stout
09f91e6e23 Merge "Fix missing api on kitkat." into lmp-mr1-ub-dev 2015-03-17 19:46:48 +00:00
The Android Automerger
8f79160730 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-03-17 06:05:29 -07:00
Xavier Ducrohet
cd572c0032 am 4ea9bca1: Update build tools to 22.0.1. DO NOT MERGE. 
* commit '4ea9bca1234a5a122d4c8db39dc2b4dde5799928':
  Update build tools to 22.0.1. DO NOT MERGE.
 2015-03-16 22:28:04 +00:00
Xavier Ducrohet
4ea9bca123 Update build tools to 22.0.1. DO NOT MERGE. 
Bug: 19085051
Change-Id: Ia62982e7bee589c37f8a755d7e6bb51264556412
 2015-03-16 15:21:39 -07:00
The Android Automerger
13315fe24e merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-03-12 06:05:43 -07:00
Deepanshu Gupta
0536cbb469 am b15f499b: Merge "Update SDK Platform Pkg revision for API 22 to 2. [DO NOT MERGE]" into lmp-mr1-dev 
* commit 'b15f499b972ec3d09ac36feb15d5535c1b6cd030':
  Update SDK Platform Pkg revision for API 22 to 2. [DO NOT MERGE]
 2015-03-12 00:39:11 +00:00
Deepanshu Gupta
b15f499b97 Merge "Update SDK Platform Pkg revision for API 22 to 2. [DO NOT MERGE]" into lmp-mr1-dev 2015-03-12 00:33:15 +00:00
The Android Automerger
a2c490f849 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-03-11 06:05:20 -07:00
Deepanshu Gupta
06f472a302 Update SDK Platform Pkg revision for API 22 to 2. [DO NOT MERGE] 
Change-Id: I5060825f330a2da9234744510aa45eb283509113
 2015-03-10 17:59:16 -07:00
Xavier Ducrohet
5db57146cd am aeb400d3: Reset support version to <API>.0.0 
* commit 'aeb400d30cbbc9d48689de3b75f92855f88d0861':
  Reset support version to <API>.0.0
 2015-03-10 23:05:31 +00:00
Xavier Ducrohet
aeb400d30c Reset support version to <API>.0.0 
Change-Id: I740e937ee51fcbcd0aafc054138f8939110d7cb6
 2015-03-10 15:24:16 -07:00
Craig Stout
3da78ae74d Add branding to DetailsFragment and TitleHelper with RowsFragment. 
b/16029942

Change-Id: I4179245c110ce74ebd5e50d55432e8ed3332d52b
 2015-03-10 10:22:28 -07:00
Craig Stout
038b75ead3 Fix missing api on kitkat. 
Change-Id: I047b1d1198c262e1836bb43551a65c6eab8bc5b4
 2015-03-09 12:49:44 -07:00
The Android Automerger
92692a7127 merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev 2015-03-03 06:05:24 -08:00