Nick Pelly
|
078edfb6ba
|
Merge branch 'readonly-p4-master'
|
2009-04-08 19:24:05 -07:00 |
|
Romain Guy
|
82734d92a0
|
Merge branch 'readonly-p4-master'
|
2009-04-08 19:21:21 -07:00 |
|
Fred Quintana
|
57fb1cba52
|
Merge branch 'readonly-p4-master'
|
2009-04-08 19:16:09 -07:00 |
|
Android (Google) Code Review
|
d83eaa0d31
|
Merge change 54
* changes:
Revert "Enable OpenCORE on master - part 1"
|
2009-04-08 17:02:55 -07:00 |
|
Android (Google) Code Review
|
f968f2de31
|
Merge change 53
* changes:
Revert "Changes required to accommodate OpenCORE 2.0"
|
2009-04-08 16:59:58 -07:00 |
|
Nick Pelly
|
4fea662b0f
|
Merge branch 'readonly-p4-donut' into donut
|
2009-04-08 15:10:29 -07:00 |
|
Romain Guy
|
885d9a3fce
|
Merge branch 'readonly-p4-donut' into donut
|
2009-04-08 14:23:53 -07:00 |
|
Android (Google) Code Review
|
ad632d282b
|
Merge change 38 into donut
* changes:
Fix issue #1769910 (Track activity launch times)
|
2009-04-08 13:42:34 -07:00 |
|
Cynthia Wong
|
5ef76a0245
|
Merge branch 'readonly-p4-master'
|
2009-04-08 13:33:32 -07:00 |
|
Fred Quintana
|
4248a4e776
|
Merge branch 'readonly-p4-master'
|
2009-04-08 00:39:52 -07:00 |
|
Andy McFadden
|
e9e210781e
|
Merge branch 'readonly-p4-master'
|
2009-04-08 00:37:08 -07:00 |
|
Eric Fischer
|
fb21b9565e
|
Merge branch 'readonly-p4-master'
|
2009-04-08 00:31:50 -07:00 |
|
Cynthia Wong
|
b5ded5f81b
|
Merge branch 'readonly-p4-donut' into donut
|
2009-04-07 17:25:27 -07:00 |
|
Android (Google) Code Review
|
24870c82c9
|
Merge change 37 into donut
* changes:
Preserve an Activity's setIntent() state across relaunches
|
2009-04-07 16:54:26 -07:00 |
|
Dave Sparks
|
ab14b7f8e1
|
Merge branch 'readonly-p4-master'
|
2009-04-06 18:41:07 -07:00 |
|
Wink Saville
|
76e9b15b00
|
Merge branch 'readonly-p4-master'
|
2009-04-06 15:24:36 -07:00 |
|
Jaikumar Ganesh
|
260f6c7431
|
Merge branch 'readonly-p4-master'
|
2009-04-06 13:42:57 -07:00 |
|
Mike Lockwood
|
29932391ac
|
Merge branch 'readonly-p4-master'
|
2009-04-06 10:53:41 -07:00 |
|
Grace Kloba
|
4f6136abce
|
Merge branch 'readonly-p4-master'
|
2009-04-06 10:48:36 -07:00 |
|
Mike Lockwood
|
a7bac9322f
|
Merge branch 'readonly-p4-master'
|
2009-04-06 06:04:19 -07:00 |
|
Mike Lockwood
|
5047ca9432
|
Merge branch 'readonly-p4-master'
|
2009-04-06 05:19:27 -07:00 |
|
Mike Lockwood
|
f1ac736d40
|
Merge branch 'readonly-p4-master'
|
2009-04-05 14:54:19 -07:00 |
|
Mike Lockwood
|
4dad4c685d
|
Merge branch 'readonly-p4-master'
|
2009-04-05 14:17:42 -07:00 |
|
Romain Guy
|
686f1fcaa8
|
Merge branch 'readonly-p4-master'
|
2009-04-03 17:41:18 -07:00 |
|
Robert Greenwalt
|
3cc7f9b737
|
Merge branch 'readonly-p4-master'
|
2009-04-03 16:46:32 -07:00 |
|
Andy McFadden
|
13bf117a00
|
Merge branch 'readonly-p4-master'
|
2009-04-03 11:10:54 -07:00 |
|
Mike Lockwood
|
458ee91092
|
Merge branch 'readonly-p4-master'
|
2009-04-03 09:49:06 -07:00 |
|
Mike Lockwood
|
9dfa8f4084
|
Merge branch 'readonly-p4-master'
|
2009-04-03 08:26:05 -07:00 |
|
Evan Millar
|
011e31039c
|
Merge branch 'readonly-p4-master'
|
2009-04-02 23:47:53 -07:00 |
|
Mike Lockwood
|
6aa749d9b4
|
Merge branch 'readonly-p4-master'
|
2009-04-02 23:42:42 -07:00 |
|
Eric Fischer
|
18794911c9
|
Merge branch 'readonly-p4-master'
|
2009-04-02 23:40:06 -07:00 |
|
Robert Greenwalt
|
e53f640038
|
Merge branch 'readonly-p4-master'
|
2009-04-02 23:37:35 -07:00 |
|
Eric Fischer
|
88dbd8b00d
|
Merge branch 'readonly-p4-master'
|
2009-04-02 23:32:28 -07:00 |
|
Evan Millar
|
4bc657c95b
|
Merge branch 'readonly-p4-master'
|
2009-04-02 23:29:53 -07:00 |
|
Jean-Michel Trivi
|
479f45991f
|
Merge branch 'readonly-p4-master'
|
2009-04-02 23:27:19 -07:00 |
|
Xia Wang
|
e92913171b
|
Merge branch 'readonly-p4-master'
|
2009-04-02 23:22:15 -07:00 |
|
Suchi Amalapurapu
|
70fab66b4d
|
Merge branch 'readonly-p4-master'
|
2009-04-02 23:19:43 -07:00 |
|
Chris Tate
|
84531e59dd
|
Merge branch 'readonly-p4-master'
|
2009-04-02 23:17:06 -07:00 |
|
Jack Palevich
|
e177066308
|
Merge branch 'readonly-p4-master'
|
2009-04-02 23:06:30 -07:00 |
|
Jack Palevich
|
4ec2152709
|
AI 144401: am: CL 144282 Tweak this tool to work with the current directory structure.
Also leave the "generated" directory around if it contains files that
need to be checked in.
Original author: jackpal
Automated import of CL 144401
|
2009-04-02 23:05:05 -07:00 |
|
Amith Yamasani
|
be0cf6230f
|
Merge branch 'readonly-p4-master'
|
2009-04-02 22:50:23 -07:00 |
|
Robert Greenwalt
|
d4dbd6d85f
|
Merge branch 'readonly-p4-master'
|
2009-04-02 22:42:34 -07:00 |
|
Mike Lockwood
|
712a858b5a
|
Merge branch 'readonly-p4-master'
|
2009-04-02 22:34:31 -07:00 |
|
Jack Palevich
|
c893868227
|
AI 144282: Tweak this tool to work with the current directory structure.
Also leave the "generated" directory around if it contains files that
need to be checked in.
Automated import of CL 144282
|
2009-04-02 13:38:26 -07:00 |
|
The Android Open Source Project
|
7cdc711750
|
Merge branch 'readonly-p4-master'
Conflicts:
telephony/java/com/android/internal/telephony/gsm/RIL.java
resolved by removing gsm/RIL.java
|
2009-04-02 12:18:20 -07:00 |
|
Grace Kloba
|
a059185c3d
|
Merge branch 'readonly-p4-master'
|
2009-04-02 10:56:49 -07:00 |
|
Leon Scroggins
|
5196165438
|
Merge branch 'readonly-p4-master'
|
2009-04-02 10:49:03 -07:00 |
|
Daisuke Miyakawa
|
bd9166e8c6
|
Merge branch 'readonly-p4-master'
|
2009-04-02 10:45:40 -07:00 |
|
Ray Chen
|
f002e92432
|
Merge branch 'readonly-p4-master'
|
2009-04-02 10:43:05 -07:00 |
|
Nick Pelly
|
40b304e574
|
Merge branch 'readonly-p4-master'
|
2009-04-02 10:31:50 -07:00 |
|