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
Joe Fernandez
ff96449f1d am 35aecbe9: am cd500663: am 90d2aca7: am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs 
* commit '35aecbe92761c7608ce3942f5743bae8254fdaf6':
  docs: adding studio-sample-in-editor.png file
 2015-01-16 22:34:46 +00:00
Ricardo Cervera
3fee7dc78a am 7a2e85c8: am 9273b33f: am 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib Javadoc 
* commit '7a2e85c83eabe113ca05d2ecf4633008d601a560':
  docs: Add browseable Wearable Support Lib Javadoc
 2015-01-16 22:34:42 +00:00
Joe Fernandez
35aecbe927 am cd500663: am 90d2aca7: am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs 
* commit 'cd50066386887148f99dce9b449bed588a354bb3':
  docs: adding studio-sample-in-editor.png file
 2015-01-16 22:29:48 +00:00
Ricardo Cervera
7a2e85c83e am 9273b33f: am 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib Javadoc 
* commit '9273b33f6ecfa20ff524ae6fcb88f2586c79b6da':
  docs: Add browseable Wearable Support Lib Javadoc
 2015-01-16 22:29:43 +00:00
Quddus Chong
a649122977 am 930ac01f: am de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs 
* commit '930ac01fd728067a79335e2983b870528c13a872':
  docs: Fixed typos in Game Controller training code snippets. bug: 17959906
 2015-01-16 22:28:24 +00:00
Svet Ganov
605ba80277 am 2004fdf8: am 830f39ad: Merge "Fixing a memory leak: activities are leaked." into lmp-mr1-dev 
* commit '2004fdf8e54daa84a8c4da20909f81f37add66d5':
  Fixing a memory leak: activities are leaked.
 2015-01-16 22:25:01 +00:00
Joe Fernandez
cd50066386 am 90d2aca7: am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs 
* commit '90d2aca7f05b2e2acf8a7bc37d8007074fdbdea5':
  docs: adding studio-sample-in-editor.png file
 2015-01-16 22:23:22 +00:00
Ricardo Cervera
9273b33f6e am 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib Javadoc 
* commit '73f36d47465da113f39270f4f9cf5d601aa0b585':
  docs: Add browseable Wearable Support Lib Javadoc
 2015-01-16 22:23:19 +00:00
Quddus Chong
930ac01fd7 am de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs 
* commit 'de0a87007b987a76af2ddd526dd473ad83fbb74b':
  docs: Fixed typos in Game Controller training code snippets. bug: 17959906
 2015-01-16 22:21:34 +00:00
Svet Ganov
2004fdf8e5 am 830f39ad: Merge "Fixing a memory leak: activities are leaked." into lmp-mr1-dev 
* commit '830f39ad3cb2c0ff2300c7288e695def37e3b1dd':
  Fixing a memory leak: activities are leaked.
 2015-01-16 22:18:57 +00:00
Joe Fernandez
90d2aca7f0 am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs 
* commit '217d145d49940d28a3c5914d94ce2e56f243301b':
  docs: adding studio-sample-in-editor.png file
 2015-01-16 22:15:25 +00:00
Ricardo Cervera
73f36d4746 am e229751d: docs: Add browseable Wearable Support Lib Javadoc 
* commit 'e229751d11692ede7fed3b56472f2d020767b412':
  docs: Add browseable Wearable Support Lib Javadoc
 2015-01-16 22:15:21 +00:00
Svet Ganov
830f39ad3c Merge "Fixing a memory leak: activities are leaked." into lmp-mr1-dev 2015-01-16 22:12:56 +00:00
Adam Lesinski
42eea270a0 Process base APK 
The base APK may have resources with configurations that compete
against some splits. The base APK must be involved in the selection
of splits.

Bug:18982001
Change-Id: Ieb29b5a36cf2c68e7831484d98a9fd275acd97e8
 2015-01-16 14:11:30 -08:00
Quddus Chong
de0a87007b Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs 2015-01-16 22:03:33 +00:00
Joe Fernandez
217d145d49 Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs 2015-01-16 21:58:37 +00:00
Craig Mautner
62e815bf7b am 02c7c97a: am ac70b2d1: Merge "More debugging for bug 18201239." into lmp-mr1-dev 
* commit '02c7c97a62ba9b79e56d1f7e206615e6eaca0689':
  More debugging for bug 18201239.
 2015-01-16 21:07:13 +00:00
Craig Mautner
02c7c97a62 am ac70b2d1: Merge "More debugging for bug 18201239." into lmp-mr1-dev 
* commit 'ac70b2d1722fd3ad94b2bf1e8c7695bded56987a':
  More debugging for bug 18201239.
 2015-01-16 21:01:25 +00:00
Craig Mautner
ac70b2d172 Merge "More debugging for bug 18201239." into lmp-mr1-dev 2015-01-16 20:56:58 +00:00
Craig Mautner
66c4a824b9 More debugging for bug 18201239. 
Fixes bug 19045133.

Change-Id: I2ef2b8600278ed91df59db4acf4740dac970ee3a
 2015-01-16 12:52:54 -08:00
Geoff Mendal
eef5734d96 am 3891ce73: (-s ours) am 2c8e6daa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '3891ce73206d4cf74c6aec1d5bf1b2b89fb90cb2':
  Import translations. DO NOT MERGE
 2015-01-16 20:52:29 +00:00
Geoff Mendal
3891ce7320 am 2c8e6daa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '2c8e6daab7158ee2a5fd3eff0cd5f5d61961fa27':
  Import translations. DO NOT MERGE
 2015-01-16 20:46:48 +00:00
Geoff Mendal
2c8e6daab7 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2015-01-16 20:40:18 +00:00
Geoff Mendal
f1270cfb84 Import translations. DO NOT MERGE 
Change-Id: Ib02415ea924e876ae776b34ed271dcae2b9afbb1
Auto-generated-cl: translation import
 2015-01-16 12:37:30 -08:00
Rich Slogar
8f93abeb60 docs: adding studio-sample-in-editor.png file 
Change-Id: I8b200eeb5134e9c66cb198f06ccfaa78a7f6a505
 2015-01-16 12:26:20 -08:00
Winson Chung
57653fc4a4 am 898290af: am 166cf980: Merge "DO NOT MERGE. Don\'t use visibility flags to determine whether to dismiss Recents. (Bug 18802531)" into lmp-mr1-dev 
* commit '898290afd55733b09a98eb15f6c71d6aaad75072':
  DO NOT MERGE. Don't use visibility flags to determine whether to dismiss Recents. (Bug 18802531)
 2015-01-16 20:22:44 +00:00
Winson Chung
898290afd5 am 166cf980: Merge "DO NOT MERGE. Don\'t use visibility flags to determine whether to dismiss Recents. (Bug 18802531)" into lmp-mr1-dev 
* commit '166cf980afafb83add7479cfeb3a8e0283cfee81':
  DO NOT MERGE. Don't use visibility flags to determine whether to dismiss Recents. (Bug 18802531)
 2015-01-16 20:15:30 +00:00
Joe Fernandez
8871470ced am 5444e342: am fadcbc70: am b7ac4dff: am aafd29be: am 8304b8b9: Merge "docs: studio disk space requirements typo" into lmp-docs 
* commit '5444e342c23e65d5efa3e9ef2b25cf0c7bfad468':
  docs: studio disk space requirements typo
 2015-01-16 20:12:31 +00:00
Winson Chung
166cf980af Merge "DO NOT MERGE. Don't use visibility flags to determine whether to dismiss Recents. (Bug 18802531)" into lmp-mr1-dev 2015-01-16 20:09:40 +00:00
Joe Fernandez
5444e342c2 am fadcbc70: am b7ac4dff: am aafd29be: am 8304b8b9: Merge "docs: studio disk space requirements typo" into lmp-docs 
* commit 'fadcbc705f8669ce5276089da466bd08f8bb11e1':
  docs: studio disk space requirements typo
 2015-01-16 20:05:37 +00:00
Joe Fernandez
b5e3d2b043 am 5d320493: am 478d4e86: am 0b596de9: am c6f70adf: am c84021ba: Merge "docs: link to sdk manager" into lmp-docs 
* commit '5d320493cb7605dcc579e9a9e3ee2bb5537413c4':
  docs: link to sdk manager
 2015-01-16 20:02:51 +00:00
Ricardo Cervera
a7bd93363f am de89f449: am ddcc2161: am c12a3e35: am 85bfcbd3: am 97c4ba98: docs: Added info on noHistory and onActivityResult(). 
* commit 'de89f449a7159370b674f1c7cadf5558af0ef9e2':
  docs: Added info on noHistory and onActivityResult().
 2015-01-16 20:02:45 +00:00
Joe Fernandez
5d320493cb am 478d4e86: am 0b596de9: am c6f70adf: am c84021ba: Merge "docs: link to sdk manager" into lmp-docs 
* commit '478d4e86ffc98c4d4a83efebe651d2e06e6af6d2':
  docs: link to sdk manager
 2015-01-16 19:57:35 +00:00
Ricardo Cervera
de89f449a7 am ddcc2161: am c12a3e35: am 85bfcbd3: am 97c4ba98: docs: Added info on noHistory and onActivityResult(). 
* commit 'ddcc21610ffb756a610b29aa9bfcbbb4cb5c94ca':
  docs: Added info on noHistory and onActivityResult().
 2015-01-16 19:57:31 +00:00
Joe Fernandez
fadcbc705f am b7ac4dff: am aafd29be: am 8304b8b9: Merge "docs: studio disk space requirements typo" into lmp-docs 
* commit 'b7ac4dff3d97865cde5d6876d30dde0a77848f25':
  docs: studio disk space requirements typo
 2015-01-16 19:55:52 +00:00
Joe Fernandez
478d4e86ff am 0b596de9: am c6f70adf: am c84021ba: Merge "docs: link to sdk manager" into lmp-docs 
* commit '0b596de9a4cc9b8d0694838f4b699c722d448bac':
  docs: link to sdk manager
 2015-01-16 19:51:08 +00:00
Ricardo Cervera
ddcc21610f am c12a3e35: am 85bfcbd3: am 97c4ba98: docs: Added info on noHistory and onActivityResult(). 
* commit 'c12a3e35a4330d5b60ac652597a6875868d96e55':
  docs: Added info on noHistory and onActivityResult().
 2015-01-16 19:51:04 +00:00
Joe Fernandez
b7ac4dff3d am aafd29be: am 8304b8b9: Merge "docs: studio disk space requirements typo" into lmp-docs 
* commit 'aafd29beb8d455fd825e2f0f0f8792b1ca6dc6ca':
  docs: studio disk space requirements typo
 2015-01-16 19:49:08 +00:00
Quddus Chong
03c15cf4c9 docs: Fixed typos in Game Controller training code snippets. 
bug: 17959906

Change-Id: I2fa1b01704a69536b3d27fe6aa96c441d7f8fb27
 2015-01-16 11:36:18 -08:00
Ricardo Cervera
e229751d11 docs: Add browseable Wearable Support Lib Javadoc 
Change-Id: Ied1f25f637c529046b0adc1e1ea173a290b22da1
 2015-01-16 11:18:10 -08:00
Joe Fernandez
0b596de9a4 am c6f70adf: am c84021ba: Merge "docs: link to sdk manager" into lmp-docs 
* commit 'c6f70adf2439978954fefe00a9ff24135654ed52':
  docs: link to sdk manager
 2015-01-16 18:57:42 +00:00
Ricardo Cervera
c12a3e35a4 am 85bfcbd3: am 97c4ba98: docs: Added info on noHistory and onActivityResult(). 
* commit '85bfcbd3e2367768c1d026cbba6fe0fa9a6b2dae':
  docs: Added info on noHistory and onActivityResult().
 2015-01-16 18:57:39 +00:00
Joe Fernandez
aafd29beb8 am 8304b8b9: Merge "docs: studio disk space requirements typo" into lmp-docs 
* commit '8304b8b9ceae4c35ddf4ae80b552127e5ed77ce4':
  docs: studio disk space requirements typo
 2015-01-16 18:56:25 +00:00
Joe Fernandez
c6f70adf24 am c84021ba: Merge "docs: link to sdk manager" into lmp-docs 
* commit 'c84021ba99d9326b016120a1d7aab4ee551bcce9':
  docs: link to sdk manager
 2015-01-16 18:52:12 +00:00
Ricardo Cervera
85bfcbd3e2 am 97c4ba98: docs: Added info on noHistory and onActivityResult(). 
* commit '97c4ba9862006e2c9f4cea07f55dc7120d305e5a':
  docs: Added info on noHistory and onActivityResult().
 2015-01-16 18:52:08 +00:00
Joe Fernandez
8304b8b9ce Merge "docs: studio disk space requirements typo" into lmp-docs 2015-01-16 18:49:28 +00:00
Joe Fernandez
c84021ba99 Merge "docs: link to sdk manager" into lmp-docs 2015-01-16 18:47:54 +00:00
Ricardo Cervera
1e59b338e6 am 08314642: am 90312d80: am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev 
* commit '083146428420dd3daa887d6e9c019e747a604cb5':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 18:47:08 +00:00
Ricardo Cervera
0831464284 am 90312d80: am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev 
* commit '90312d808f4a5181b5cb99c78e64b7e5d1465895':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 18:41:59 +00:00
Ricardo Cervera
90312d808f am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev 
* commit '2287879039556ad3c8fce58974e2396b4a2dab45':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 18:36:45 +00:00