drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
174,796 Commits 1 Branch 0 Tags
Commit Graph

174796 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rich Slogar
6de010f600 docs: remove exploring sdk link 
b.android 153523

Change-Id: Iaf4de80196d10d686d5a4bde5ffa4169df2810cd
 2015-02-23 11:37:36 -08:00
Deepanshu Gupta
01d5286f38 am 8f022fd3: am 5ed4fc9e: am 99142d29: am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev 
* commit '8f022fd323063f9cebb481be650db40cf5e486f3':
  Set forceFramework correctly for included layouts.
 2015-02-23 19:29:31 +00:00
Deepanshu Gupta
8f022fd323 am 5ed4fc9e: am 99142d29: am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev 
* commit '5ed4fc9efda45d2411b8b9bc8cab55b8e270b13c':
  Set forceFramework correctly for included layouts.
 2015-02-23 19:22:31 +00:00
Deepanshu Gupta
5ed4fc9efd am 99142d29: am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev 
* commit '99142d298213e93f673057c2334b04b38f7e4450':
  Set forceFramework correctly for included layouts.
 2015-02-23 19:15:57 +00:00
Deepanshu Gupta
99142d2982 am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev 
* commit '3f8e2b9302fba0ace67fb0459d6ffb0884c4d80b':
  Set forceFramework correctly for included layouts.
 2015-02-23 19:09:14 +00:00
Deepanshu Gupta
3f8e2b9302 am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev 
* commit '30a67cd17af03e53b8be5638f7f70d2989a7cd78':
  Set forceFramework correctly for included layouts.
 2015-02-23 19:03:29 +00:00
Deepanshu Gupta
30a67cd17a Merge "Set forceFramework correctly for included layouts." into lmp-dev 2015-02-23 18:56:27 +00:00
Dan Albert
10caf0390d Update autogenerated gl functions. 
Corresponding frameworks/native change:
https://android-review.googlesource.com/#/c/134491/

Since this fixes the int-to-pointer cast issues, stop ignoring that
warning.

Change-Id: I85134dc151ba368e4619e36125264b2b3f104202
 2015-02-23 10:47:19 -08:00
David Friedman
6248cdd588 am 84e40b1f: am d77380b8: am 3570268b: am 09e9076d: am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs 
* commit '84e40b1f338eba0a352a6bf3a0f2801c21e17d59':
  Fixes several typos.
 2015-02-23 18:39:53 +00:00
David Friedman
96824427e9 am 2c689468: am fcbc8428: am f066c235: am 18c8a35f: am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs 
* commit '2c6894685dff6c6f8bbb1af59cf9c8f4acb162c8':
  Update Google Play brand-info page. Bug: 18257984
 2015-02-23 18:39:47 +00:00
David Friedman
84e40b1f33 am d77380b8: am 3570268b: am 09e9076d: am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs 
* commit 'd77380b856050a5d933cbd4cc0ada6192de65f48':
  Fixes several typos.
 2015-02-23 18:33:08 +00:00
David Friedman
2c6894685d am fcbc8428: am f066c235: am 18c8a35f: am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs 
* commit 'fcbc842878df5fbe3d8a62add407bb512179e28a':
  Update Google Play brand-info page. Bug: 18257984
 2015-02-23 18:33:04 +00:00
David Friedman
d77380b856 am 3570268b: am 09e9076d: am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs 
* commit '3570268bcf1e4c375d8b592714f8b7be25819873':
  Fixes several typos.
 2015-02-23 18:26:10 +00:00
David Friedman
fcbc842878 am f066c235: am 18c8a35f: am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs 
* commit 'f066c2358d48fdc2ecbc28af99bc8332a3d78ce1':
  Update Google Play brand-info page. Bug: 18257984
 2015-02-23 18:26:06 +00:00
David Friedman
3570268bcf am 09e9076d: am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs 
* commit '09e9076ddfd5e9f738cd5096409ff3fb61174803':
  Fixes several typos.
 2015-02-23 18:20:37 +00:00
David Friedman
f066c2358d am 18c8a35f: am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs 
* commit '18c8a35fa4e775c3b515e739b0f32981395914ad':
  Update Google Play brand-info page. Bug: 18257984
 2015-02-23 18:20:32 +00:00
David Friedman
09e9076ddf am ab0f8ff7: am 88e0145f: Merge "Fixes several typos." into lmp-docs 
* commit 'ab0f8ff740d314182ccc644f118a7f8ba6c4937e':
  Fixes several typos.
 2015-02-23 18:13:36 +00:00
David Friedman
18c8a35fa4 am 8e604689: am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs 
* commit '8e604689c8c8f8ad073e12094991daa712cd8f38':
  Update Google Play brand-info page. Bug: 18257984
 2015-02-23 18:13:32 +00:00
David Friedman
ab0f8ff740 am 88e0145f: Merge "Fixes several typos." into lmp-docs 
* commit '88e0145fb82b6711527ab173e4dc817e3f430708':
  Fixes several typos.
 2015-02-23 18:06:47 +00:00
David Friedman
8e604689c8 am 3c26756a: Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs 
* commit '3c26756aefae228941588042d677424b54167aa7':
  Update Google Play brand-info page. Bug: 18257984
 2015-02-23 18:06:43 +00:00
David Friedman
88e0145fb8 Merge "Fixes several typos." into lmp-docs 2015-02-23 18:05:36 +00:00
David Friedman
3c26756aef Merge "Update Google Play brand-info page. Bug: 18257984" into lmp-docs 2015-02-23 18:02:26 +00:00
Deepanshu Gupta
33c1c07796 Set forceFramework correctly for included layouts. 
Bug: http://b.android.com/151326
Change-Id: I759f6e1a7a1c83bbbb771ddbb92843a105acffa4
 2015-02-23 17:26:12 +00:00
Geoff Mendal
c37feed094 am 87809139: (-s ours) am 4c58f127: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '87809139d223ae1e5629590ba7611b9b1da63cbb':
  Import translations. DO NOT MERGE
 2015-02-23 16:47:35 +00:00
Geoff Mendal
87809139d2 am 4c58f127: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '4c58f1271d60554375d85598134fdc821563e78a':
  Import translations. DO NOT MERGE
 2015-02-23 16:41:22 +00:00
Geoff Mendal
4c58f1271d Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-02-23 16:34:42 +00:00
Narayan Kamath
688ff4cf0f Track removal of refcounts from FileMap. 
Use delete instead of release.

Change-Id: I25c841b368aa9d51e9259399b94cafa2bbb7a076
 2015-02-23 15:47:54 +00:00
Geoff Mendal
1df5df2b77 Import translations. DO NOT MERGE 
Change-Id: Ia406db95dc51e21b462e9de8451ad221023447fd
Auto-generated-cl: translation import
 2015-02-23 07:47:09 -08:00
Geoff Mendal
9dd645bdd0 am 84cd5f64: (-s ours) am e74331dc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '84cd5f64c340067b1a8e3e7a7c7d1e86ca155313':
  Import translations. DO NOT MERGE
 2015-02-23 14:32:42 +00:00
Geoff Mendal
0c2de5faa5 am 5f28b32c: (-s ours) am dc82f4ce: (-s ours) Import translations. DO NOT MERGE 
* commit '5f28b32ce6f5fe99af76b2c8e8c95e9fd148a530':
  Import translations. DO NOT MERGE
 2015-02-23 14:27:02 +00:00
Geoff Mendal
84cd5f64c3 am e74331dc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'e74331dc0ef5393115a4381e98b860d80ddfe2a7':
  Import translations. DO NOT MERGE
 2015-02-23 14:26:47 +00:00
Geoff Mendal
5f28b32ce6 am dc82f4ce: (-s ours) Import translations. DO NOT MERGE 
* commit 'dc82f4ce1c77066f07ddf06c5fe923350a86b4e9':
  Import translations. DO NOT MERGE
 2015-02-23 14:20:49 +00:00
Geoff Mendal
e74331dc0e Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-02-23 14:20:07 +00:00
Geoff Mendal
954759b363 Import translations. DO NOT MERGE 
Change-Id: I06d6d60e4d09ad158c554e6c8e3865f06895db56
Auto-generated-cl: translation import
 2015-02-23 06:18:26 -08:00
Geoff Mendal
dc82f4ce1c Import translations. DO NOT MERGE 
Change-Id: I470855ce547f2e302f9ad27a3c08ad40d8fd0048
Auto-generated-cl: translation import
 2015-02-23 06:12:16 -08:00
Geoff Mendal
c8a4babe93 am 5211dfd5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit '5211dfd5b49b4e0ed1dbd6bb06e3f96244b55134':
  Import translations. DO NOT MERGE
 2015-02-23 13:55:42 +00:00
Geoff Mendal
85f270f69c am 1f4e01f2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit '1f4e01f2b30e713cfb679fcb81286ba4a2fd7b53':
  Import translations. DO NOT MERGE
 2015-02-23 13:55:37 +00:00
Geoff Mendal
6001319ae4 am 7aaaacc1: (-s ours) Import translations. DO NOT MERGE 
* commit '7aaaacc1d1f9c2928c1d4d5df457163eebbdc36f':
  Import translations. DO NOT MERGE
 2015-02-23 13:55:31 +00:00
Geoff Mendal
5211dfd5b4 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-23 13:52:35 +00:00
Geoff Mendal
1f4e01f2b3 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-23 13:52:02 +00:00
Geoff Mendal
52a260b4b4 Import translations. DO NOT MERGE 
Change-Id: I44a58cca048a4a35b5f815c4be9bd1ca1bfad1b7
Auto-generated-cl: translation import
 2015-02-23 05:50:48 -08:00
Geoff Mendal
5f159d65c0 Import translations. DO NOT MERGE 
Change-Id: Ib78275fac19887a479cacb3797c3ddb9e2d1cb0e
Auto-generated-cl: translation import
 2015-02-23 07:50:45 -06:00
Geoff Mendal
7aaaacc1d1 Import translations. DO NOT MERGE 
Change-Id: I35b9d89969207b2ce627e5e7af517e6f8f519650
Auto-generated-cl: translation import
 2015-02-23 05:44:35 -08:00
Narayan Kamath
836e4413d0 am c90df076: am 6b492e78: Merge "Clean up Javadocs for UEventObserver" 
* commit 'c90df0768a9be3e40d7c1edfdfb28af7bd25d98e':
  Clean up Javadocs for UEventObserver
 2015-02-23 11:00:51 +00:00
Narayan Kamath
c90df0768a am 6b492e78: Merge "Clean up Javadocs for UEventObserver" 
* commit '6b492e78115833f0093d1517483728b574121c07':
  Clean up Javadocs for UEventObserver
 2015-02-23 10:54:40 +00:00
Narayan Kamath
6b492e7811 Merge "Clean up Javadocs for UEventObserver" 2015-02-23 10:50:19 +00:00
Valter Strods
7014b26c3e Clean up Javadocs for UEventObserver 
This commit removes a couple of apostrophes from the word "UEvents" as
the apostrophes would only be needed if something that belongs to the
UEvent was being talked about. Instead, the UEvents are being talked
about themselves - as a bunch.

Change-Id: I6a7908c6b73c0739102b632d2499e0f1e3c2d47f
 2015-02-23 10:48:32 +00:00
Elliott Hughes
031a9b1319 am 92c4f175: am d002e027: Merge "Fix \'fuchsia\' typo." 
* commit '92c4f1756d4ae8ef1082f159f7133ad811f235d4':
  Fix 'fuchsia' typo.
 2015-02-21 17:15:00 +00:00
Elliott Hughes
92c4f1756d am d002e027: Merge "Fix \'fuchsia\' typo." 
* commit 'd002e02750b51fed3da41a2b4b222824df8d1a10':
  Fix 'fuchsia' typo.
 2015-02-21 17:09:46 +00:00
Elliott Hughes
d002e02750 Merge "Fix 'fuchsia' typo." 2015-02-21 17:04:21 +00:00