LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,272 Commits 2 Branches 0 Tags
bd48d1e676d23f8f6ff9b57d1a92e4b3935bfecc
Commit Graph

13272 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
6dd8880cc9 Reconcile with jb-dev - do not merge 
Change-Id: Ie0ff01ab85c75e2dc14c12c14ff641aa4cf54b58
 2012-10-03 15:22:04 -07:00
The Android Open Source Project
2c590655f9 am 0f929c09: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '0f929c09897e61161b92548b9c2f30a165973e3f':
 2012-10-03 07:34:40 -07:00
The Android Open Source Project
0f929c0989 Reconcile with jb-mr1-release - do not merge 
Change-Id: Idc1f130f1db6f6312680a512439eb7a7a0a5110e
 2012-10-03 07:33:18 -07:00
The Android Automerger
6aa2a9c781 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-03 06:59:19 -07:00
Andy Stadler
a703665865 am e3ab405b: (-s ours) am 7b920976: am de479873: Classpath cleanups - DO NOT MERGE 
* commit 'e3ab405b315feaf90da714e3b5c1e705caa479fe':
  Classpath cleanups - DO NOT MERGE
 2012-10-02 21:33:16 -07:00
Andy Stadler
e3ab405b31 am 7b920976: am de479873: Classpath cleanups - DO NOT MERGE 
* commit '7b920976c774b69f80592b60718960d21faec2a7':
  Classpath cleanups - DO NOT MERGE
 2012-10-02 21:31:45 -07:00
Andy Stadler
7b920976c7 am de479873: Classpath cleanups - DO NOT MERGE 
* commit 'de479873e52e2e941e9b25cdaa7234a8ff5ade55':
  Classpath cleanups - DO NOT MERGE
 2012-10-02 21:29:55 -07:00
Andy Stadler
de479873e5 Classpath cleanups - DO NOT MERGE 
* Add external/mp4parser
* Cleanup after Email rewinding

This does not affect system image builds at all - just fixes eclipse
workspace so there are no errors reported.

Change-Id: I2aee831e460b4acb63b2b999bab4131a08af6bd9
 2012-10-02 16:40:54 -07:00
The Android Open Source Project
a42df017bd am bd219806: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit 'bd219806c37a38825fb89c889396c80a6445554a':
 2012-10-02 09:18:53 -07:00
The Android Open Source Project
bd219806c3 Reconcile with jb-mr1-release - do not merge 
Change-Id: I92e095e0ea2a4ce39286a4b132d2ae0c68eb5e7a
 2012-10-02 09:17:01 -07:00
The Android Automerger
071fde625a merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-30 06:59:19 -07:00
Jean-Baptiste Queru
c3dde82321 am ea54f651: Merge from jb-mr1-aah-dev 
* commit 'ea54f651b0210d003ff5137d7ef7b34bc7677349':
 2012-09-28 17:13:04 -07:00
Jean-Baptiste Queru
ea54f651b0 Merge from jb-mr1-aah-dev 
Change-Id: I63e57aae9dc8c0efe990c848298d7d00e0060197
 2012-09-28 17:08:13 -07:00
Baligh Uddin
24c6519f95 am 0eedcba2: am 6b03c84e: Use more secure exponent for generating keys 
* commit '0eedcba2f5922b841c01d4188f9fcea97d6b258b':
  Use more secure exponent for generating keys
 2012-09-28 15:52:44 -07:00
Baligh Uddin
97b8be9b31 am 6b03c84e: Use more secure exponent for generating keys 
* commit '6b03c84e6ec660884d3cc216302b5f462bb1ce65':
  Use more secure exponent for generating keys
 2012-09-28 14:48:19 -07:00
Baligh Uddin
0eedcba2f5 am 6b03c84e: Use more secure exponent for generating keys 
* commit '6b03c84e6ec660884d3cc216302b5f462bb1ce65':
  Use more secure exponent for generating keys
 2012-09-28 14:47:44 -07:00
Jean-Baptiste Queru
4954c1ef3e am 1466bf7a: Merge from jb-mr1-aah-dev 
* commit '1466bf7a363aa472bd7e9e4608fa46a0c36251b1':
  Import translations. DO NOT MERGE
 2012-09-28 13:31:15 -07:00
Jean-Baptiste Queru
1466bf7a36 Merge from jb-mr1-aah-dev 
Change-Id: I0930df5393313f0cba4a30f7b30506e751022a91
 2012-09-28 13:26:31 -07:00
Baligh Uddin
6b03c84e6e Use more secure exponent for generating keys 
Bug: 7246090
Change-Id: Ic6cbac975fcb96b436e27a87b1f81b5e3dac6321
 2012-09-28 11:30:10 -07:00
The Android Open Source Project
7cc92cc7e4 am e3dd9f0b: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit 'e3dd9f0b0853a8c0fa6270a430f10512d81b1b05':
 2012-09-28 00:32:21 -07:00
The Android Open Source Project
e3dd9f0b08 Reconcile with jb-mr1-release - do not merge 
Change-Id: I86b0f44dc30be99464eb2a1d6891798cd1b14250
 2012-09-27 09:57:11 -07:00
The Android Automerger
708cf98801 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-27 06:59:22 -07:00
Jeff Sharkey
9750c02285 am 652f9784: am 7b487466: Clean up Global settings stragglers. 
* commit '652f9784738c6cd77f323c97227f815cfd285fec':
  Clean up Global settings stragglers.
 2012-09-26 20:21:20 -07:00
Jeff Sharkey
cc9e74e1b5 am 7b487466: Clean up Global settings stragglers. 
* commit '7b4874660e94685b76828e1f93b651ac38742bd7':
  Clean up Global settings stragglers.
 2012-09-26 20:17:16 -07:00
Jeff Sharkey
652f978473 am 7b487466: Clean up Global settings stragglers. 
* commit '7b4874660e94685b76828e1f93b651ac38742bd7':
  Clean up Global settings stragglers.
 2012-09-26 20:16:51 -07:00
Jeff Sharkey
7b4874660e Clean up Global settings stragglers. 
Bug: 7242121
Change-Id: I27fd307e2ee4854558a6f6e4d2fdbbae3e89ffe0
 2012-09-26 17:10:48 -07:00
Andrew Hsieh
03f0cea60b am 4d6e7a3b: am 24e005a2: am c7daea04: Merge "Replace __unused in linux/sysctl.h with __linux_unused" 
* commit '4d6e7a3b9f929767596c5a77781a9fa7d1fd9706':
  Replace __unused in linux/sysctl.h with __linux_unused
 2012-09-26 15:52:19 -07:00
Andrew Hsieh
4d6e7a3b9f am 24e005a2: am c7daea04: Merge "Replace __unused in linux/sysctl.h with __linux_unused" 
* commit '24e005a234eae1def238e4521481e7399b880bf6':
  Replace __unused in linux/sysctl.h with __linux_unused
 2012-09-26 15:50:00 -07:00
Andrew Hsieh
24e005a234 am c7daea04: Merge "Replace __unused in linux/sysctl.h with __linux_unused" 
* commit 'c7daea046b9f05fb07936bafd2f7436478781a2d':
  Replace __unused in linux/sysctl.h with __linux_unused
 2012-09-26 15:48:00 -07:00
Andrew Hsieh
c7daea046b Merge "Replace __unused in linux/sysctl.h with __linux_unused" 2012-09-26 15:32:50 -07:00
Andrew Hsieh
36ffaf5406 Replace __unused in linux/sysctl.h with __linux_unused 
To avoid conflict with "#define __unused" in sys/cdefs.h

See
  https://android-review.googlesource.com/#/c/43479
  https://android-review.googlesource.com/#/c/43565

Change-Id: I6b8155570f4398b3ee8845d75bd231bca7f1d86f
 2012-09-26 15:11:39 -07:00
The Android Open Source Project
9418bcd8cf am 776db9f1: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '776db9f1e1bee2d5219bacdbb1c3426a248ce0f9':
 2012-09-26 10:07:45 -07:00
The Android Open Source Project
776db9f1e1 Reconcile with jb-mr1-release - do not merge 
Change-Id: I7aacf788266531fc9b333554cbdae78711b794f7
 2012-09-26 09:06:10 -07:00
The Android Automerger
7862fb2a20 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-26 06:59:17 -07:00
Adam Momtaz
a5f7aefc33 am 0fc87b40: am 28542540: Merge "Added UiAutomator samples to SDK" into jb-mr1-dev 
* commit '0fc87b400f8acc60baa24c405abcf41410f74bdf':
  Added UiAutomator samples to SDK
 2012-09-25 19:10:42 -07:00
Adam Momtaz
a4b4caff50 am 28542540: Merge "Added UiAutomator samples to SDK" into jb-mr1-dev 
* commit '28542540043817912576e6e6f43e0ca804948d75':
  Added UiAutomator samples to SDK
 2012-09-25 19:08:46 -07:00
Adam Momtaz
0fc87b400f am 28542540: Merge "Added UiAutomator samples to SDK" into jb-mr1-dev 
* commit '28542540043817912576e6e6f43e0ca804948d75':
  Added UiAutomator samples to SDK
 2012-09-25 19:08:37 -07:00
Adam Momtaz
2854254004 Merge "Added UiAutomator samples to SDK" into jb-mr1-dev 2012-09-25 19:06:57 -07:00
Adam Momtaz
8213206c6e Added UiAutomator samples to SDK 
Verified tests are building OK.

Change-Id: I838e44e84b3d9e2e503bff4ed2b95887996d8801
 2012-09-25 17:15:17 -07:00
Dianne Hackborn
ab2546e1fd am b441bc8c: am 7263dad2: Update API demos to match new tab interaction. 
* commit 'b441bc8c76a0d1fc4a292a56113439456dc8ccb3':
  Update API demos to match new tab interaction.
 2012-09-25 17:13:14 -07:00
Dianne Hackborn
b441bc8c76 am 7263dad2: Update API demos to match new tab interaction. 
* commit '7263dad223864b9be5aa3458dabdc6f0d8db1f0c':
  Update API demos to match new tab interaction.
 2012-09-25 17:11:42 -07:00
Dianne Hackborn
e016e351e1 am 7263dad2: Update API demos to match new tab interaction. 
* commit '7263dad223864b9be5aa3458dabdc6f0d8db1f0c':
  Update API demos to match new tab interaction.
 2012-09-25 17:11:37 -07:00
Dianne Hackborn
7263dad223 Update API demos to match new tab interaction. 
Follow changes to FragmentTabManager to continue to work
correctly with it.  Fix the code in the base API demo (which
can't use FragmentTabManager) to work correctly.

Bug #7232088: ListView saved state being lost in some cases

Change-Id: Ib7ba1ab20ff00f2cc95c9f6024ab94783237c9be
 2012-09-25 15:07:06 -07:00
The Android Automerger
9babfd842c merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-25 06:59:23 -07:00
Andy Stadler
28f349bbb0 Merge commit '7a494baf' into manualmerge 
Conflicts:
	ide/eclipse/.classpath

Change-Id: I0bb9abaef2525b38816f7901f13dd7ddb9167f4b
 2012-09-24 17:47:47 -07:00
Andy Stadler
7a494bafc0 am e61482e7: Fix .classpath to track bouncycastle/bcprov 
* commit 'e61482e7e58e73f2b8777719afd92cf75681bb3c':
  Fix .classpath to track bouncycastle/bcprov
 2012-09-24 17:39:42 -07:00
Andy Stadler
0ee4a150f8 am e61482e7: Fix .classpath to track bouncycastle/bcprov 
* commit 'e61482e7e58e73f2b8777719afd92cf75681bb3c':
  Fix .classpath to track bouncycastle/bcprov
 2012-09-24 17:38:11 -07:00
Andy Stadler
e61482e7e5 Fix .classpath to track bouncycastle/bcprov 
Change-Id: If8d142ebc96eb76f1e0b12a8d741f2e91b5d8598
 2012-09-24 17:34:26 -07:00
Xavier Ducrohet
e51e0d050f am 45480c46: am 34580b76: am fa82c449: am 45825eae: Update platform-tools sdk comp to 15. 
* commit '45480c46dd8e13329c53222067ef2d51deb79ed1':
  Update platform-tools sdk comp to 15.
 2012-09-24 15:04:21 -07:00
Xavier Ducrohet
45480c46dd am 34580b76: am fa82c449: am 45825eae: Update platform-tools sdk comp to 15. 
* commit '34580b76b65d83c3085fc63911b3651ce5dc8a57':
  Update platform-tools sdk comp to 15.
 2012-09-24 15:01:58 -07:00