Android (Google) Code Review
090d32b275
am 9ae8873: Merge change 617 into donut
...
Merge commit '9ae8873ed83035e8527526e2cc1a189caf0e8d9e'
* commit '9ae8873ed83035e8527526e2cc1a189caf0e8d9e':
Allow caller-supplied column aliases in queries even when a projection map is used.
2009-04-29 13:41:23 -07:00
Michael Chan
99c4483cd7
Allow caller-supplied column aliases in queries even when a projection map is used.
...
Modified SQLiteQueryBuilder to allow caller-spplied column alias ("AS")
instead restricting to the keys of the supplied projection map. This is needed for
UNION queries where new columns may be created on the fly such as "1 AS flag"
2009-04-27 16:32:45 -07:00
Dianne Hackborn
75534fbe24
Merge branch 'readonly-p4-master'
2009-04-13 16:13:37 -07:00
Dianne Hackborn
935ae463d4
AI 145994: Integrate #145778 from Donut.
...
Automated import of CL 145994
2009-04-13 16:11:55 -07:00
Andy Stadler
f8a7ceaef2
AI 145778: Manual merge changes 145382-145384 from cupcake.
...
Automated import of CL 145778
2009-04-10 16:24:47 -07:00
The Android Open Source Project
762d30a313
Merge branch 'open_source' into google_internal
...
Conflicts:
core/java/android/widget/TwoLineListItem.java
core/res/res/values/public.xml
preloaded-classes
2009-03-29 08:55:27 -07:00
Fred Quintana
22f711423e
Automated import from //branches/master/...@141380,141380
2009-03-24 20:10:17 -07:00
Jean-Baptiste Queru
2a73de7b21
Merge commit 'remotes/korg/cupcake' into merge
...
Conflicts:
core/java/android/view/animation/TranslateAnimation.java
core/jni/Android.mk
core/res/res/values-en-rGB/strings.xml
libs/audioflinger/AudioFlinger.cpp
libs/surfaceflinger/LayerScreenshot.cpp
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
2009-03-18 11:33:14 -07:00
The Android Open Source Project
4df2423a94
auto import from //depot/cupcake/@136594
2009-03-05 14:34:35 -08:00
Yusuke Ohmichi(maimuzo)
accbadeb52
fix issue #1587
2009-03-04 14:14:21 -08:00
The Android Open Source Project
9066cfe988
auto import from //depot/cupcake/@135843
2009-03-03 19:31:44 -08:00
The Android Open Source Project
d83a98f4ce
auto import from //depot/cupcake/@135843
2009-03-03 18:28:45 -08:00
The Android Open Source Project
076357b856
auto import from //depot/cupcake/@132589
2009-03-03 14:04:24 -08:00
The Android Open Source Project
3dec7d563a
auto import from //depot/cupcake/@137055
2009-03-02 22:54:33 -08:00
The Android Open Source Project
3001a03543
auto import from //branches/cupcake/...@132276
2009-02-19 10:57:31 -08:00
The Android Open Source Project
d24b8183b9
auto import from //branches/cupcake/...@130745
2009-02-10 15:44:00 -08:00
The Android Open Source Project
f013e1afd1
Code drop from //branches/cupcake/...@124589
2008-12-17 18:05:43 -08:00
The Android Open Source Project
54b6cfa9a9
Initial Contribution
2008-10-21 07:00:00 -07:00
