OSDN Git Service
Romain Guy [Sun, 31 Oct 2010 18:21:24 +0000 (11:21 -0700)]
Romain Guy [Sun, 31 Oct 2010 18:12:51 +0000 (11:12 -0700)]
Merge "fix typo"
Uwe Voelker [Sun, 31 Oct 2010 09:08:04 +0000 (10:08 +0100)]
fix typo
Change-Id: Ib36aabc68128d1b2b8c41b965a10be2ab2f4cd93
Dianne Hackborn [Sat, 30 Oct 2010 02:03:03 +0000 (19:03 -0700)]
am
70a2c15e: Final SDK API 9. DO NOT MERGE.
* commit '
70a2c15ecfd4e8cd8581699d5df8a219c7d5cdb1':
Final SDK API 9. DO NOT MERGE.
Dianne Hackborn [Wed, 27 Oct 2010 19:31:34 +0000 (12:31 -0700)]
Final SDK API 9. DO NOT MERGE.
Change-Id: I3e2fc2ebc52eecb26ac3a6bb466447f378fb5de6
Scott Main [Sat, 30 Oct 2010 00:21:07 +0000 (17:21 -0700)]
am
38fd3948: am
579db096: docs: remove another "new" tag
* commit '
38fd394815a992c8874f73389e8ca849782e5fcd':
docs: remove another "new" tag
Scott Main [Sat, 30 Oct 2010 00:16:57 +0000 (17:16 -0700)]
am
579db096: docs: remove another "new" tag
* commit '
579db096fa05bd077fadb04876ecf99e3ccd02b9':
docs: remove another "new" tag
Scott Main [Sat, 30 Oct 2010 00:12:37 +0000 (17:12 -0700)]
docs: remove another "new" tag
Change-Id: I54d56f2090dee856741ea23028b51c85e526c46b
Neal Nguyen [Sat, 30 Oct 2010 00:10:12 +0000 (17:10 -0700)]
am
06875afa: Merge "A little tweaking of DL Manager tests and adding better debugging output." into gingerbread
* commit '
06875afad6101892a735f79aeb2c7bdbb58c26fa':
A little tweaking of DL Manager tests and adding better debugging output.
Neal Nguyen [Sat, 30 Oct 2010 00:07:59 +0000 (17:07 -0700)]
Merge "A little tweaking of DL Manager tests and adding better debugging output." into gingerbread
Scott Main [Fri, 29 Oct 2010 22:37:17 +0000 (15:37 -0700)]
am
6e8d6bd0: Merge "docs: Update various SDK docs for GB platform and tools" into gingerbread
* commit '
6e8d6bd09facabcc0f868960e6453b8f79cd9136':
docs: Update various SDK docs for GB platform and tools
Scott Main [Fri, 29 Oct 2010 22:34:00 +0000 (15:34 -0700)]
Merge "docs: Update various SDK docs for GB platform and tools" into gingerbread
Neal Nguyen [Mon, 25 Oct 2010 01:02:45 +0000 (18:02 -0700)]
A little tweaking of DL Manager tests and adding better debugging output.
Adding more detail to the output logging to help track down issues, fixing some
download completed notification counter flakiness and making reboot test more
robust, and reducing the number of concurrent downloads in testMultipleDownloads()
to 10. After talking with Vasu, this is probably more appropriate as it is
closer to typical usage scenarios, and as a side effect should trim some
time from the test runs. Large numbers of downloads will be left for stress
testing.
Change-Id: Ie337cfe9b8d27299d70553e39c60e241ff3afe66
Leon Clarke [Fri, 29 Oct 2010 21:49:07 +0000 (14:49 -0700)]
am
5ccbe059: DO NOT MERGE. Add assets for <select>
* commit '
5ccbe05945325dc77d543d44b69a7f80196d8cb9':
DO NOT MERGE. Add assets for <select>
Leon Clarke [Thu, 18 Mar 2010 13:42:56 +0000 (13:42 +0000)]
DO NOT MERGE. Add assets for <select>
Bug:
3133784
Cherry-picking to GB from master.
Change-Id: I7d37c22f555d0e7c59a58fdad1516d3d77bf6d14
Scott Main [Fri, 29 Oct 2010 17:24:04 +0000 (10:24 -0700)]
am
1112632a: Merge "docs: revise javadocs for sip add a package description, revise class descriptions and edit some method docs" into gingerbread
* commit '
1112632a41462c5dd34c7af9f67b88188a520517':
docs: revise javadocs for sip add a package description, revise class descriptions and edit some method docs
Scott Main [Fri, 29 Oct 2010 17:03:36 +0000 (10:03 -0700)]
Merge "docs: revise javadocs for sip add a package description, revise class descriptions and edit some method docs" into gingerbread
Joe Onorato [Fri, 29 Oct 2010 15:16:20 +0000 (08:16 -0700)]
am
ed3c7be8: Merge "Report the new size to wallpapers when the requested size changed." into gingerbread
* commit '
ed3c7be84255d48fe7f0454bdd51b3955698cafe':
Report the new size to wallpapers when the requested size changed.
Nick Pelly [Fri, 29 Oct 2010 15:15:48 +0000 (08:15 -0700)]
am
4bf4b491: Merge "Hide some NFC API\'s." into gingerbread
* commit '
4bf4b491be3fbd0f71bb87749a0e31f817b91e08':
Hide some NFC API's.
Scott Main [Thu, 28 Oct 2010 07:02:31 +0000 (00:02 -0700)]
docs: Update various SDK docs for GB platform and tools
Change-Id: I8ccb296e5fba57743197bec140e9c79750f0d4f6
Joe Onorato [Fri, 29 Oct 2010 01:18:52 +0000 (18:18 -0700)]
Merge "Report the new size to wallpapers when the requested size changed." into gingerbread
Joe Onorato [Fri, 29 Oct 2010 01:03:23 +0000 (18:03 -0700)]
Report the new size to wallpapers when the requested size changed.
We were telling the app, but we weren't saving the data for ourselves.
This also tells them to re-scroll when there's a new size.
Bug:
3144373
Change-Id: I9d12b714119ff02dd7d7f1cfa997d8a44475b9e9
Nick Pelly [Thu, 28 Oct 2010 23:47:31 +0000 (16:47 -0700)]
Merge "Hide some NFC API's." into gingerbread
Scott Main [Fri, 22 Oct 2010 18:29:57 +0000 (11:29 -0700)]
docs: revise javadocs for sip
add a package description, revise class descriptions and edit some method docs
Change-Id: Ice969a99c830349674c65d99e4b7a6f1d2f24a7e
Nick Pelly [Thu, 28 Oct 2010 20:39:37 +0000 (13:39 -0700)]
Hide some NFC API's.
We are leaving enough API so that you can see when any Tag is discovered,
get its ID, and get its NDEF messages.
But for advanced use - creating tag connections and writing messages - we have
2 problems. Firstly a lot of the code is untested
(RawTagConnection.transceive()), or in some cases known not to work
(NdefTagConnection.write()). Secondly, there is still debate about how to
best expose information about Tags.
The set of data/methods exposed for a Tag changes completely depending on the
tag technology. There may be multiple sets of technology implemented in a
single tag. Tag A may have technology X and Y, Tag B may have technology Y
and Z. Furthermore, some NFC controllers will be not be able to use all
technologies, and so Android Device 1 may see technology X and Y on Tag A but
Android device 2 may only see technology X. So we have a pretty challenging
set of constraints to work under, and we are not convinced the current Tag and
NdefTag class is the best approach going forwards.
The Tag application should be able to remain unbundled, since it just needs to
get incoming NDEF Messages.
Change-Id: Ic09f094f33794e10f8d730fffe011c9a5957e0ac
Signed-off-by: Nick Pelly <npelly@google.com>
Mike Lockwood [Thu, 28 Oct 2010 21:30:34 +0000 (14:30 -0700)]
am
c9fa90f9: Merge "GPS: remove some logging" into gingerbread
* commit '
c9fa90f94b664589d584bb433e748e2b01b368c9':
GPS: remove some logging
Mike Lockwood [Thu, 28 Oct 2010 21:28:46 +0000 (14:28 -0700)]
Merge "GPS: remove some logging" into gingerbread
Jeff Hamilton [Thu, 28 Oct 2010 21:03:40 +0000 (14:03 -0700)]
am
bd8ff5b5: Merge "DO NOT MERGE. Fix asset file descriptor for pipe based fds." into gingerbread
* commit '
bd8ff5b5d4f4c74889ce20a0c7a2f8e0ab7b6ea9':
DO NOT MERGE. Fix asset file descriptor for pipe based fds.
Jeff Hamilton [Thu, 28 Oct 2010 21:01:21 +0000 (14:01 -0700)]
Merge "DO NOT MERGE. Fix asset file descriptor for pipe based fds." into gingerbread
Jeff Hamilton [Thu, 28 Oct 2010 20:05:27 +0000 (15:05 -0500)]
DO NOT MERGE. Fix asset file descriptor for pipe based fds.
Change-Id: Ic366d01f91017109abfcfa65bd2231dd7416ce71
Justin Ho [Thu, 28 Oct 2010 17:30:10 +0000 (10:30 -0700)]
am
9112b8eb: DO NOT MERGE - Ringtone bugfixes (round 1)
* commit '
9112b8ebd22ce5c83081066bea8a424eda8bda9d':
DO NOT MERGE - Ringtone bugfixes (round 1)
Justin Ho [Thu, 28 Oct 2010 17:23:33 +0000 (10:23 -0700)]
DO NOT MERGE - Ringtone bugfixes (round 1)
Change-Id: Idb72659b9cb00ec141b1229f42951e0a6e0b9a9a
Mike Lockwood [Thu, 28 Oct 2010 11:34:47 +0000 (07:34 -0400)]
GPS: remove some logging
Change-Id: Ib2dca53364c9da207a87f2664b54d2ec1d1bd8d9
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mathias Agopian [Thu, 28 Oct 2010 06:46:25 +0000 (23:46 -0700)]
am
7d452f69: Merge "really fix [
3118445] Transform * Transform does not work as expected" into gingerbread
Mathias Agopian [Thu, 28 Oct 2010 06:44:07 +0000 (23:44 -0700)]
Merge "really fix [
3118445] Transform * Transform does not work as expected" into gingerbread
Jaikumar Ganesh [Thu, 28 Oct 2010 06:44:02 +0000 (23:44 -0700)]
am
025f78eb: Merge "DO NOT MERGE Fix auto connection with headsets which don\'t send incoming connections for all profiles." into gingerbread
Jaikumar Ganesh [Thu, 28 Oct 2010 06:42:43 +0000 (23:42 -0700)]
Merge "DO NOT MERGE Fix auto connection with headsets which don't send incoming connections for all profiles." into gingerbread
Jeff Brown [Thu, 28 Oct 2010 02:31:24 +0000 (19:31 -0700)]
am
120a4594: Drop all dispatcher state when dispatcher is disabled.
Jeff Brown [Thu, 28 Oct 2010 01:43:51 +0000 (18:43 -0700)]
Drop all dispatcher state when dispatcher is disabled.
This patch makes the dispatcher drop all of its state when it is
disabled (when the screen turns off). This ensures that the dispatcher
does not get stuck thinking a pointer is still down if the screen
turned off while the user was touching the display (such as a fat touch
while hitting the power button).
Bug:
3098344
Change-Id: If50ef5804870aa1acd3179fd4b40e3cda58dd39d
Mathias Agopian [Tue, 26 Oct 2010 01:29:35 +0000 (18:29 -0700)]
really fix [
3118445] Transform * Transform does not work as expected
Two bugs were counter acting each other.
- rotation matrices are on the left-hand side of multiplies
- the transform of the overlay is applied before that of the layer
Change-Id: Ia79bd368e9b719235c89ecf244ea263f01ce906a
Jaikumar Ganesh [Wed, 27 Oct 2010 22:57:23 +0000 (15:57 -0700)]
DO NOT MERGE Fix auto connection with headsets which don't send incoming
connections for all profiles.
Bug:
3136095
Change-Id: I48f36b99f3f7619a6a18c6adc2057c9d6d23c3e3
Dianne Hackborn [Wed, 27 Oct 2010 21:59:28 +0000 (14:59 -0700)]
am
aa93bcd6: Fix issue #
3138926: App\'s preferences can be lost after onPause()
Dianne Hackborn [Wed, 27 Oct 2010 20:57:00 +0000 (13:57 -0700)]
Fix issue #
3138926: App's preferences can be lost after onPause()
Change-Id: Icea3d37fab5e47c89c5cbc0adff7bbec898fa93e
Andy McFadden [Wed, 27 Oct 2010 20:25:29 +0000 (13:25 -0700)]
am
001c7d12: Merge "Set capabilities sooner." into gingerbread
Andy McFadden [Wed, 27 Oct 2010 20:22:50 +0000 (13:22 -0700)]
Merge "Set capabilities sooner." into gingerbread
Andy McFadden [Wed, 27 Oct 2010 18:26:05 +0000 (11:26 -0700)]
Set capabilities sooner.
Bug
3135433.
Change-Id: I4e34b60c0a01b85ce0d80eb96ff3510604a68c71
Xavier Ducrohet [Wed, 27 Oct 2010 18:23:58 +0000 (11:23 -0700)]
am
63e5d07e: Merge "Fix issue with project resources overriding framework resources." into gingerbread
Xavier Ducrohet [Wed, 27 Oct 2010 18:22:22 +0000 (11:22 -0700)]
Merge "Fix issue with project resources overriding framework resources." into gingerbread
Yu Shan Emily Lau [Wed, 27 Oct 2010 18:14:36 +0000 (11:14 -0700)]
am
8b023a2e: Merge "Add the mediaplayer release in the test validation. This is to ensure the media player release properly." into gingerbread
Yu Shan Emily Lau [Wed, 27 Oct 2010 18:12:58 +0000 (11:12 -0700)]
Merge "Add the mediaplayer release in the test validation. This is to ensure the media player release properly." into gingerbread
Marco Nelissen [Wed, 27 Oct 2010 18:08:14 +0000 (11:08 -0700)]
am
67c7a4ae: Merge "Fix off-by-two and other bugs in the visualization code. b/
3137511" into gingerbread
Marco Nelissen [Wed, 27 Oct 2010 18:06:39 +0000 (11:06 -0700)]
Merge "Fix off-by-two and other bugs in the visualization code. b/
3137511" into gingerbread
Nick Pelly [Wed, 27 Oct 2010 17:43:19 +0000 (10:43 -0700)]
am
6d55e134: Make best effort attempt to recover NFC service when it dies.
Marco Nelissen [Wed, 27 Oct 2010 16:06:01 +0000 (09:06 -0700)]
Fix off-by-two and other bugs in the visualization code.
b/
3137511
Change-Id: Ic431701e93c025bc417c9742e9af6bb2350c7dd6
Nick Pelly [Wed, 27 Oct 2010 08:14:43 +0000 (01:14 -0700)]
Make best effort attempt to recover NFC service when it dies.
Retrieve the service again from ServiceManager on RemoteException.
Change-Id: Ie227b52019e7deafeab712af1addd6d957f7a8ee
Signed-off-by: Nick Pelly <npelly@google.com>
Xavier Ducrohet [Tue, 26 Oct 2010 23:58:34 +0000 (16:58 -0700)]
Fix issue with project resources overriding framework resources.
Framework resources loaded through Drawable.createFromXml could
be overriden by project resources if there were loaded through
a state list drawable where the final resource name was used
by a project resource (of the same type).
This ensures that the XML parser knows that it's a framework
resource being parsed and that the resource resolution uses
that information.
Change-Id: I39cf9eba755e55f1604b968637aeecff969a558d
Andreas Huber [Tue, 26 Oct 2010 23:23:54 +0000 (16:23 -0700)]
am
2088e371: Merge "Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise." into gingerbread
Andreas Huber [Tue, 26 Oct 2010 23:21:47 +0000 (16:21 -0700)]
Merge "Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise." into gingerbread
Justin Ho [Tue, 26 Oct 2010 23:08:13 +0000 (16:08 -0700)]
am
3810c08b: Merge "DO NOT MERGE - Fixing ringtones that were put in as notifications" into gingerbread
Justin Ho [Tue, 26 Oct 2010 23:06:28 +0000 (16:06 -0700)]
Merge "DO NOT MERGE - Fixing ringtones that were put in as notifications" into gingerbread
Justin Ho [Tue, 26 Oct 2010 22:34:07 +0000 (15:34 -0700)]
DO NOT MERGE - Fixing ringtones that were put in as notifications
Change-Id: I09a8a0f369604a6332b921b9e944a800ec4d6677
Andreas Huber [Tue, 26 Oct 2010 22:01:03 +0000 (15:01 -0700)]
Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise.
Change-Id: Iea88e3f09955d82a9a11fbcc075db8d9c4007490
Yu Shan Emily Lau [Tue, 26 Oct 2010 21:36:09 +0000 (14:36 -0700)]
Add the mediaplayer release in the test validation. This is to ensure the media player release properly.
Change-Id: Ia4758a3c549b64b6efead18e7538d977dee2be76
Mathias Agopian [Tue, 26 Oct 2010 19:22:12 +0000 (12:22 -0700)]
am
2f19f56a: Merge "Updade Surface (ANativeWindow) format based on its buffers format" into gingerbread
Mathias Agopian [Tue, 26 Oct 2010 19:19:48 +0000 (12:19 -0700)]
am
5219dd8e: Merge "add format parameter to setBufferGeometry" into gingerbread
Mathias Agopian [Tue, 26 Oct 2010 19:19:43 +0000 (12:19 -0700)]
am
a7b745ca: Merge "fix eglChooseConfig() for special attributes." into gingerbread
Mathias Agopian [Tue, 26 Oct 2010 19:18:32 +0000 (12:18 -0700)]
Merge "Updade Surface (ANativeWindow) format based on its buffers format" into gingerbread
Mathias Agopian [Tue, 26 Oct 2010 19:18:19 +0000 (12:18 -0700)]
Merge "add format parameter to setBufferGeometry" into gingerbread
Mathias Agopian [Tue, 26 Oct 2010 19:18:07 +0000 (12:18 -0700)]
Merge "fix eglChooseConfig() for special attributes." into gingerbread
Jeff Hamilton [Tue, 26 Oct 2010 19:16:10 +0000 (12:16 -0700)]
am
d8cf2125: Merge "Add a way to get a string for an error code." into gingerbread
Jeff Hamilton [Tue, 26 Oct 2010 19:14:17 +0000 (12:14 -0700)]
Merge "Add a way to get a string for an error code." into gingerbread
Xavier Ducrohet [Tue, 26 Oct 2010 19:10:28 +0000 (12:10 -0700)]
am
1b6180ec: Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." into gingerbread
Jeff Hamilton [Tue, 26 Oct 2010 19:09:48 +0000 (14:09 -0500)]
Add a way to get a string for an error code.
Change-Id: I133e974c656eb558349cbc3f9a2caf5b18c8fc3d
Xavier Ducrohet [Tue, 26 Oct 2010 19:09:18 +0000 (12:09 -0700)]
Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." into gingerbread
Xavier Ducrohet [Tue, 26 Oct 2010 18:18:39 +0000 (11:18 -0700)]
Fix rendering of digitalClock/Gallery in Eclipse editors.
Change-Id: I80f4f90b173529632eaf2fbc3bb5471b7ede8216
Justin Ho [Tue, 26 Oct 2010 16:11:12 +0000 (09:11 -0700)]
am
5a147d08: Merge "DO NOT MERGE - Fixing capitalized ringtone metadata only" into gingerbread
Justin Ho [Tue, 26 Oct 2010 16:09:22 +0000 (09:09 -0700)]
Merge "DO NOT MERGE - Fixing capitalized ringtone metadata only" into gingerbread
Justin Ho [Tue, 26 Oct 2010 16:05:06 +0000 (09:05 -0700)]
DO NOT MERGE - Fixing capitalized ringtone metadata only
Change-Id: Ib16ca195356b6cbb3d3926f6d5a3de366eaa980e
Mike Lockwood [Tue, 26 Oct 2010 15:36:24 +0000 (08:36 -0700)]
am
1d28a840: Merge "Location Manager: Fix LocationManager.getBestProvider filtering." into gingerbread
Mike Lockwood [Tue, 26 Oct 2010 15:34:32 +0000 (08:34 -0700)]
Merge "Location Manager: Fix LocationManager.getBestProvider filtering." into gingerbread
Eric Laurent [Tue, 26 Oct 2010 15:14:48 +0000 (08:14 -0700)]
am
1a58d9c3: Merge "Partial fix for issue
3124895." into gingerbread
Eric Laurent [Tue, 26 Oct 2010 15:13:32 +0000 (08:13 -0700)]
Merge "Partial fix for issue
3124895." into gingerbread
Jeff Hamilton [Tue, 26 Oct 2010 14:24:57 +0000 (07:24 -0700)]
am
79fb6449: Merge "Make some contructors public but hidden." into gingerbread
Joe Onorato [Tue, 26 Oct 2010 14:24:41 +0000 (07:24 -0700)]
am
11e2e9b0: Merge "Don\'t turn the button backlights on if the screen is off. Part 2." into gingerbread
Jeff Hamilton [Tue, 26 Oct 2010 14:16:46 +0000 (07:16 -0700)]
Merge "Make some contructors public but hidden." into gingerbread
Mike Lockwood [Tue, 26 Oct 2010 14:01:55 +0000 (10:01 -0400)]
Location Manager: Fix LocationManager.getBestProvider filtering.
getBestProvider should only return location providers that the client
has permission to use.
BUG:
3124614
Change-Id: I065091d0445092563bc53fb4f7d93a1ab6bebb9a
Signed-off-by: Mike Lockwood <lockwood@android.com>
Jeff Hamilton [Tue, 26 Oct 2010 13:59:18 +0000 (08:59 -0500)]
Make some contructors public but hidden.
This allows them to be used from within the
NFC stack process internally.
Change-Id: I7f81759da63d451efe86550a57a400fb224b2064
Eric Laurent [Tue, 26 Oct 2010 02:42:08 +0000 (19:42 -0700)]
Partial fix for issue
3124895.
When a SIP call is put on hold and no other call is active, the audio mode should not be
switched to incall.
Change-Id: I1307330f10cbfb9c4223bcb9dc4faa79778750af
Joe Onorato [Tue, 26 Oct 2010 01:48:08 +0000 (18:48 -0700)]
Merge "Don't turn the button backlights on if the screen is off. Part 2." into gingerbread
Jean-Baptiste Queru [Tue, 26 Oct 2010 00:28:29 +0000 (17:28 -0700)]
Merge "resolved conflicts for merge of
b4ae2f1b to gingerbread-plus-aosp" into gingerbread-plus-aosp
Jean-Baptiste Queru [Tue, 26 Oct 2010 00:27:16 +0000 (17:27 -0700)]
resolved conflicts for merge of
b4ae2f1b to gingerbread-plus-aosp
Change-Id: I9d4e2649375d9262efe8aaade0778f638d04afa8
Scott Main [Tue, 26 Oct 2010 00:23:10 +0000 (17:23 -0700)]
am
3d40cd50: am
c9ac1079: update featured videos also remove "new" tags from SDK and Resources nav items
Merge commit '
3d40cd5055a8b507877e10bfb81b3ae35a2602a4' into gingerbread-plus-aosp
* commit '
3d40cd5055a8b507877e10bfb81b3ae35a2602a4':
update featured videos
Scott Main [Tue, 26 Oct 2010 00:15:50 +0000 (17:15 -0700)]
am
c9ac1079: update featured videos also remove "new" tags from SDK and Resources nav items
Merge commit '
c9ac1079696b93a294f504c6561397ef731a46f9' into gingerbread
* commit '
c9ac1079696b93a294f504c6561397ef731a46f9':
update featured videos
Mathias Agopian [Mon, 25 Oct 2010 23:29:24 +0000 (16:29 -0700)]
Updade Surface (ANativeWindow) format based on its buffers format
this is to allow applications to change the format of a surface's
buffer, and have it reflected in EGL; which is needed for
EGLConfig validation.
Change-Id: Iee074c30ad765881e2409c1d37450b05e561c44d
Justin Ho [Mon, 25 Oct 2010 23:50:34 +0000 (16:50 -0700)]
am
044df235: Merge "DO NOT MERGE - Updated ringtone assets for crespo" into gingerbread
Merge commit '
044df235c86ac69bb0e56cb4387e111ec276276e' into gingerbread-plus-aosp
* commit '
044df235c86ac69bb0e56cb4387e111ec276276e':
DO NOT MERGE - Updated ringtone assets for crespo
Justin Ho [Mon, 25 Oct 2010 23:44:01 +0000 (16:44 -0700)]
Merge "DO NOT MERGE - Updated ringtone assets for crespo" into gingerbread
Gloria Wang [Mon, 25 Oct 2010 23:39:11 +0000 (16:39 -0700)]
Merge "resolved conflicts for merge of
9084631d to gingerbread-plus-aosp" into gingerbread-plus-aosp
Justin Ho [Mon, 25 Oct 2010 23:38:41 +0000 (16:38 -0700)]
DO NOT MERGE - Updated ringtone assets for crespo
Change-Id: Ie5c6b0bfa282f976129f5e87a09512da01e6851b
Joe Malin [Mon, 25 Oct 2010 23:22:46 +0000 (16:22 -0700)]
am
5016df1c: Merge "Doc Change: Revert NotePad sample test package" into gingerbread
Merge commit '
5016df1cface59b04ad59d0fef29ea32dcad8d60' into gingerbread-plus-aosp
* commit '
5016df1cface59b04ad59d0fef29ea32dcad8d60':
Doc Change: Revert NotePad sample test package
Eric Fischer [Mon, 25 Oct 2010 23:19:42 +0000 (16:19 -0700)]
am
3d1ce9ec: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '
3d1ce9ec2a724792951f8d29c8f3a9c3a4e9f35b' into gingerbread-plus-aosp
* commit '
3d1ce9ec2a724792951f8d29c8f3a9c3a4e9f35b':
Import revised translations. DO NOT MERGE