Commit Graph

13272 Commits

Author SHA1 Message Date
The Android Automerger
2facb7b969 merge in jb-mr1-factory-release history after reset to jb-mr1-dev 2012-10-10 08:43:30 -07:00
Jeff Sharkey
a8e4a6d043 am 6de7bde4: am 0eb3e46a: am c9ff3bce: Merge "Follow RegisteredServicesCache API changes." into jb-mr1-dev
* commit '6de7bde49b76542cadb9ad7d3b618df305cef9bc':
  Follow RegisteredServicesCache API changes.
2012-10-10 08:37:49 -07:00
Jeff Sharkey
6de7bde49b am 0eb3e46a: am c9ff3bce: Merge "Follow RegisteredServicesCache API changes." into jb-mr1-dev
* commit '0eb3e46a49af423f5d17b81d487224dab214786f':
  Follow RegisteredServicesCache API changes.
2012-10-10 08:33:33 -07:00
Jeff Sharkey
0eb3e46a49 am c9ff3bce: Merge "Follow RegisteredServicesCache API changes." into jb-mr1-dev
* commit 'c9ff3bce8b398252ee2978cca43b5ec88937f1ab':
  Follow RegisteredServicesCache API changes.
2012-10-10 08:30:28 -07:00
The Android Automerger
c4351cf30e merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-10 06:59:14 -07:00
Jeff Sharkey
c9ff3bce8b Merge "Follow RegisteredServicesCache API changes." into jb-mr1-dev 2012-10-09 23:47:12 -07:00
Brian Muramatsu
c200e94ff5 am ab8b25ff: am 03c58239: am c6fbad00: Merge "Make all monkeys do the same thing" into jb-mr1-dev
* commit 'ab8b25ff8ec856f490f5bbb95240c8fc0d24ba43':
  Make all monkeys do the same thing
2012-10-09 19:18:57 -07:00
Brian Muramatsu
ab8b25ff8e am 03c58239: am c6fbad00: Merge "Make all monkeys do the same thing" into jb-mr1-dev
* commit '03c582390784406fa227e3804cf679eacf37aa00':
  Make all monkeys do the same thing
2012-10-09 19:17:05 -07:00
Brian Muramatsu
03c5823907 am c6fbad00: Merge "Make all monkeys do the same thing" into jb-mr1-dev
* commit 'c6fbad006a4c9385670ec7c26e71a802bf1f608b':
  Make all monkeys do the same thing
2012-10-09 19:14:50 -07:00
Brian Muramatsu
c6fbad006a Merge "Make all monkeys do the same thing" into jb-mr1-dev 2012-10-09 19:12:39 -07:00
Raphael Moll
652538d6af am b41080c0: am 806cac72: am c1a8e1ec: resolved conflicts for merge of d6308897 to jb-mr1-dev
* commit 'b41080c00b357c33cdf22e36bc8d3aa0f3510ca5':
  SDK JB MR0: doc is 16 rev 3
2012-10-09 14:05:24 -07:00
Raphael Moll
b41080c00b am 806cac72: am c1a8e1ec: resolved conflicts for merge of d6308897 to jb-mr1-dev
* commit '806cac729996161f216460f67081857737d585ea':
  SDK JB MR0: doc is 16 rev 3
2012-10-09 14:02:58 -07:00
Raphael Moll
806cac7299 am c1a8e1ec: resolved conflicts for merge of d6308897 to jb-mr1-dev
* commit 'c1a8e1ec87d74dbb167ff575e8507183045584cd':
  SDK JB MR0: doc is 16 rev 3
2012-10-09 14:01:15 -07:00
Kenny Root
3cbf850ab6 Make all monkeys do the same thing
Monkeys were using SecureRandom, but what it really wanted was an LCRNG
that allowed it to reproduce the same output with seeds. This change
allows the monkeys to shine.

Bug: 6950454
Change-Id: Iabf0fc5e7d50b786fa32b946e85de797220ff569
2012-10-09 13:57:13 -07:00
Raphael Moll
c1a8e1ec87 resolved conflicts for merge of d6308897 to jb-mr1-dev
Change-Id: Iffbbb75a504e5f8b0caa5690835e17a4b6ab63bb
2012-10-09 13:44:41 -07:00
Jeff Sharkey
1d7f24de42 Follow RegisteredServicesCache API changes.
Bug: 7276595
Change-Id: I6064684380b7bbbec87c2345f782931d731ad5cb
2012-10-09 13:05:04 -07:00
Raphael Moll
d6308897c0 am 37191b53: SDK JB MR0: doc is 16 rev 3
* commit '37191b53de90cde879c167d1db74d5a73740f4c0':
  SDK JB MR0: doc is 16 rev 3
2012-10-09 12:53:20 -07:00
Raphael Moll
37191b53de SDK JB MR0: doc is 16 rev 3
Change-Id: I7e28e4dc1981c7d9502a45f3509245075da98a00
2012-10-09 12:48:10 -07:00
The Android Open Source Project
bf2920e3ab am 8cbb869a: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '8cbb869a0724a2522cf25712950da70459acb673':
2012-10-09 07:29:52 -07:00
The Android Open Source Project
8cbb869a07 Reconcile with jb-mr1-release - do not merge
Change-Id: If93b4dbbf4cb52b6640d20e1213b6619492b0545
2012-10-09 07:28:23 -07:00
The Android Automerger
b414234ed9 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-08 06:59:08 -07:00
Eino-Ville Talvala
b8a4f1eaa8 am 13e9b646: am c764e04c: am 41ee0fdc: testrunner: Match test runner name for hardware tests.
* commit '13e9b646ccd77c327387d4baf8d77dbc6de788de':
  testrunner: Match test runner name for hardware tests.
2012-10-07 23:40:20 -07:00
Eino-Ville Talvala
13e9b646cc am c764e04c: am 41ee0fdc: testrunner: Match test runner name for hardware tests.
* commit 'c764e04c54aea6aa6cc6890a35d8f97463a50b32':
  testrunner: Match test runner name for hardware tests.
2012-10-07 23:38:25 -07:00
Eino-Ville Talvala
c764e04c54 am 41ee0fdc: testrunner: Match test runner name for hardware tests.
* commit '41ee0fdc33391aa19d26f6f068fca44c48151987':
  testrunner: Match test runner name for hardware tests.
2012-10-07 23:35:30 -07:00
Eino-Ville Talvala
41ee0fdc33 testrunner: Match test runner name for hardware tests.
Change-Id: I9db719e3dde258c026e0e721e0dd58f80378f199
2012-10-05 17:12:42 -07:00
Andrew Hsieh
8a26ad1db6 am 85f798cd: am 84cf3431: am ee9d2a3b: Merge "[MIPS] Add support for waitpid."
* commit '85f798cd4cf93c5e99776f3b0b2a6d656f2c7765':
  [MIPS] Add support for waitpid.
2012-10-05 02:26:56 -07:00
Andrew Hsieh
c4e66c9cf0 am 358854c2: am 5dbbbd4f: am 098df524: Merge "[MIPS] Add Support pthread library functions."
* commit '358854c2026cddfa959e1ec374c3dc58f1781110':
  [MIPS] Add Support pthread library functions.
2012-10-05 02:26:54 -07:00
Andrew Hsieh
a6a32ffd56 am f701a16b: am b0bfe87c: am 5d629997: Merge "[MIPS] Add Support clone."
* commit 'f701a16b8dfc4b6d20eaa6167c42d573a3cd2ec4':
  [MIPS] Add Support clone.
2012-10-05 02:26:53 -07:00
Andrew Hsieh
d715ea0af4 am 1788247a: am 58786fff: am 8b394bfd: Merge "[MIPS] Updated support for statfs and fstatfs."
* commit '1788247ab08959da41c4fa745b54ab5b605f6034':
  [MIPS] Updated support for statfs and fstatfs.
2012-10-05 02:26:52 -07:00
Andrew Hsieh
c4615910b7 am 4effe363: am 352ef1b5: am f9bacbc6: Merge "[MIPS] Updated support for stat."
* commit '4effe36389f5047f3305bd03758ab380339288b3':
  [MIPS] Updated support for stat.
2012-10-05 02:26:50 -07:00
Andrew Hsieh
6c8798509e am e4774b45: am 09d940ca: am 58be4b98: Merge "[MIPS] Updated support for socket and added support for socket_pair."
* commit 'e4774b451d0d65be42776d1c21089b5185f350f7':
  [MIPS] Updated support for socket and added support for socket_pair.
2012-10-05 02:26:49 -07:00
Andrew Hsieh
25e4de339b am d8ca18f7: am cd67609d: am 9c32f373: Merge "[MIPS] Update Support for fcntl."
* commit 'd8ca18f7957d1bd5937301e1deb8296f07de93d7':
  [MIPS] Update Support for fcntl.
2012-10-05 02:26:47 -07:00
Andrew Hsieh
eec8ffc552 am 18489d83: am 460326fa: am bc2958b9: Merge "[MIPS] Add Support for syscall."
* commit '18489d83f884b92131bb589e88c1296a42a78926':
  [MIPS] Add Support for syscall.
2012-10-05 02:26:46 -07:00
Andrew Hsieh
9945540bca am a4970ddb: am 1d4173dd: am 39850f9e: Merge "[MIPS] Add Support timer_create."
* commit 'a4970ddb5ef0293ec9f7bbd845fbaa7eb9476ccb':
  [MIPS] Add Support timer_create.
2012-10-05 02:26:45 -07:00
Andrew Hsieh
03aee0888d am 92008fec: am cef0b881: am 22ae5a37: Merge "[MIPS] Add Support signal."
* commit '92008fec425c8fd21def42581c8079bb9e68d14a':
  [MIPS] Add Support signal.
2012-10-05 02:26:43 -07:00
Andrew Hsieh
85577fe64f am f832e4f9: am 76f93a10: am c1d3bef5: Merge "[MIPS] Add Support errno, Added Logging, sorted Android.mk files."
* commit 'f832e4f995e664ab7e1cefd12d001afe8324e159':
  [MIPS] Add Support errno, Added Logging, sorted Android.mk files.
2012-10-05 02:26:42 -07:00
Andrew Hsieh
85f798cd4c am 84cf3431: am ee9d2a3b: Merge "[MIPS] Add support for waitpid."
* commit '84cf343170c5fc8682af4dbfc07c4fe5eba12cb2':
  [MIPS] Add support for waitpid.
2012-10-05 02:24:51 -07:00
Andrew Hsieh
358854c202 am 5dbbbd4f: am 098df524: Merge "[MIPS] Add Support pthread library functions."
* commit '5dbbbd4f0ebf91376ce31c601b00c8ac1f576bd5':
  [MIPS] Add Support pthread library functions.
2012-10-05 02:24:50 -07:00
Andrew Hsieh
f701a16b8d am b0bfe87c: am 5d629997: Merge "[MIPS] Add Support clone."
* commit 'b0bfe87cdef9e55b6df44ffe3d2e9095e475886c':
  [MIPS] Add Support clone.
2012-10-05 02:24:49 -07:00
Andrew Hsieh
1788247ab0 am 58786fff: am 8b394bfd: Merge "[MIPS] Updated support for statfs and fstatfs."
* commit '58786fff75d00bda20f6b3ed38a66fe9b691e150':
  [MIPS] Updated support for statfs and fstatfs.
2012-10-05 02:24:47 -07:00
Andrew Hsieh
4effe36389 am 352ef1b5: am f9bacbc6: Merge "[MIPS] Updated support for stat."
* commit '352ef1b5f1a36d7ca9e2f5a32b06a1f2307845a0':
  [MIPS] Updated support for stat.
2012-10-05 02:24:46 -07:00
Andrew Hsieh
e4774b451d am 09d940ca: am 58be4b98: Merge "[MIPS] Updated support for socket and added support for socket_pair."
* commit '09d940cae0b4a70ee9f8e92be178f3408e20c8c4':
  [MIPS] Updated support for socket and added support for socket_pair.
2012-10-05 02:24:45 -07:00
Andrew Hsieh
d8ca18f795 am cd67609d: am 9c32f373: Merge "[MIPS] Update Support for fcntl."
* commit 'cd67609dc8e08dea2641f694ee09880c03309d3b':
  [MIPS] Update Support for fcntl.
2012-10-05 02:24:43 -07:00
Andrew Hsieh
18489d83f8 am 460326fa: am bc2958b9: Merge "[MIPS] Add Support for syscall."
* commit '460326fa60259b702b63fbcf6fb7ff745897f8ec':
  [MIPS] Add Support for syscall.
2012-10-05 02:24:42 -07:00
Andrew Hsieh
a4970ddb5e am 1d4173dd: am 39850f9e: Merge "[MIPS] Add Support timer_create."
* commit '1d4173dde1fecec9d64a35f1f4b51a5c7fea3039':
  [MIPS] Add Support timer_create.
2012-10-05 02:24:41 -07:00
Andrew Hsieh
92008fec42 am cef0b881: am 22ae5a37: Merge "[MIPS] Add Support signal."
* commit 'cef0b881b165018ed18c3a101c10e2aea97f3da8':
  [MIPS] Add Support signal.
2012-10-05 02:24:39 -07:00
Andrew Hsieh
f832e4f995 am 76f93a10: am c1d3bef5: Merge "[MIPS] Add Support errno, Added Logging, sorted Android.mk files."
* commit '76f93a10db56448db4ce6019cd8707f54f59f404':
  [MIPS] Add Support errno, Added Logging, sorted Android.mk files.
2012-10-05 02:24:37 -07:00
Andrew Hsieh
84cf343170 am ee9d2a3b: Merge "[MIPS] Add support for waitpid."
* commit 'ee9d2a3b0ad6258271062145087a0a9f929bb9cc':
  [MIPS] Add support for waitpid.
2012-10-05 02:23:38 -07:00
Andrew Hsieh
5dbbbd4f0e am 098df524: Merge "[MIPS] Add Support pthread library functions."
* commit '098df524a6d6a83470d086b19cb0cab52dbc9cd0':
  [MIPS] Add Support pthread library functions.
2012-10-05 02:23:36 -07:00
Andrew Hsieh
b0bfe87cde am 5d629997: Merge "[MIPS] Add Support clone."
* commit '5d629997201781d741aa8feda0660ec896a0185b':
  [MIPS] Add Support clone.
2012-10-05 02:23:35 -07:00