Log - 711516d140390aeec9e3eefb8fdb2681c3454980 - platform/frameworks/base

711516d resolved conflicts for merge of 77fc8b80 to master by Dianne Hackborn · 13 years ago
f0b517d Merge "may fix build on some version of gcc" by Mathias Agopian · 13 years ago
f1df040 may fix build on some version of gcc by Mathias Agopian · 13 years ago
77fc8b8 am 6c0533f9: am c5193c62: Merge "Add new landscape and portrait orientation features." into honeycomb-mr2 by Dianne Hackborn · 13 years ago
6c0533f am c5193c62: Merge "Add new landscape and portrait orientation features." into honeycomb-mr2 by Dianne Hackborn · 13 years ago
a7932ae Merge "Fix commment" by Daisuke Miyakawa · 13 years ago
c5193c6 Merge "Add new landscape and portrait orientation features." into honeycomb-mr2 by Dianne Hackborn · 13 years ago
e289bff Add new landscape and portrait orientation features. by Dianne Hackborn · 13 years ago
114420f Merge "Support for setting a ParcelSurfaceTexture as the MediaPlayer sink." by tedbo · 13 years ago
fd1235f Merge "VPN: do not allow zero prefix length in routing rules." by Chia-chi Yeh · 13 years ago
57aa13e Merge "VPN: do not use gateway in routing rules." by Chia-chi Yeh · 13 years ago
52e3823 Fix commment by Daisuke Miyakawa · 13 years ago
b2e9cde Merge "Update Calendar main comment" by RoboErik · 13 years ago
260598d Update Calendar main comment by RoboErik · 13 years ago
7c1650d am aabe5f46: am 49572479: Update sim missing message in lock screen. by John Wang · 13 years ago
85e7666 Merge "Duplicated fileDesc is not closed when input file is not forward-lock content. Fix for bug 4606053." by Gloria Wang · 13 years ago
aabe5f4 am 49572479: Update sim missing message in lock screen. by John Wang · 13 years ago
8068cb8 Merge "Handle always present wired ethernet interfaces at boot." by Mike J. Chen · 13 years ago
9a67f26 Merge "A few TTS bug fixes" by Narayan Kamath · 13 years ago
0e20fe5 A few TTS bug fixes by Narayan Kamath · 13 years ago
3f0363b Deprecate setEngineByPackageName by Narayan Kamath · 13 years ago
70832a3 Some tuning for MultiWaveView animations and assets: by Jim Miller · 13 years ago
fcc7977 Generate default policy for devices without IMSI. by Jeff Sharkey · 13 years ago
8a8743e Merge "cleanup Kalman filter parameters, add/fix comments/units" by Mathias Agopian · 13 years ago
3e234ba Merge "Allow touches to slide out of the navigation bar." by Jeff Brown · 13 years ago
fa77931 Merge "Settings: Remove unused USE_PTP_INTERFACE setting" by Mike Lockwood · 13 years ago
922261d Merge "audio: update for audio/audio_policy header names/locations" by Dima Zavin · 13 years ago
82f0a85 Merge "Move adb related functionality from SystemServer and NotificationManagerService to UsbDeviceManager" by Mike Lockwood · 13 years ago
1324f22 Settings: Remove unused USE_PTP_INTERFACE setting by Mike Lockwood · 13 years ago
541c994 Move adb related functionality from SystemServer and NotificationManagerService to UsbDeviceManager by Mike Lockwood · 13 years ago
ad4e03d Merge "Batch glCopyTexImage() calls to get about 15 fps back on SGX." by Romain Guy · 13 years ago
54be1cd Batch glCopyTexImage() calls to get about 15 fps back on SGX. by Romain Guy · 13 years ago
6e4ba2b Merge "Add an option to force to use HW codec in stagefright cmd tool" by James Dong · 13 years ago
451e8258 cleanup Kalman filter parameters, add/fix comments/units by Mathias Agopian · 13 years ago
decbe32 Merge "Add B frame support for MPEG4Writer" by James Dong · 13 years ago
2714abf Merge "Expose api on View to determine if the view can be scrolled." by Adam Powell · 13 years ago
14f58ff Merge "fix RefBase so it retains binary-compatibility with gingerbread" by Mathias Agopian · 13 years ago
b375d3c Merge "Mimic Zygote preload steps when using wrappers." by Jeff Brown · 13 years ago
f2751aa Merge "Take advantage of updated linux/input.h kernel headers." by Jeff Brown · 13 years ago
eb99f0d fix RefBase so it retains binary-compatibility with gingerbread by Mathias Agopian · 13 years ago
c96a667 Handle always present wired ethernet interfaces at boot. by Mike J. Chen · 13 years ago
96c7e70 VPN: do not allow zero prefix length in routing rules. by Chia-chi Yeh · 13 years ago
290029d audio: update for audio/audio_policy header names/locations by Dima Zavin · 13 years ago
a934219 Merge "Add "geoDescription" to CallerInfo" by David Brown · 13 years ago
98db5fa Allow touches to slide out of the navigation bar. by Jeff Brown · 13 years ago
b3a2d13 Take advantage of updated linux/input.h kernel headers. by Jeff Brown · 13 years ago
8ea9289 VPN: do not use gateway in routing rules. by Chia-chi Yeh · 13 years ago
6915944 Expose api on View to determine if the view can be scrolled. by Adam Powell · 13 years ago
94202fe Add "geoDescription" to CallerInfo by David Brown · 13 years ago
78b9c38 Add an option to force to use HW codec in stagefright cmd tool by James Dong · 13 years ago
0991a7f Merge changes I9b8e1962,I7bb843ca by Mathias Agopian · 13 years ago
3f71cfc Merge "Fix thread violation in WebView.getViewHeight()" by Steve Block · 13 years ago
8fa10d4 Merge "Switch is not affected by touch when disabled" by Gilles Debunne · 13 years ago
4108b1ed Add B frame support for MPEG4Writer by James Dong · 13 years ago
cbe0d94 Duplicated fileDesc is not closed when input file is not forward-lock content. by Gloria Wang · 13 years ago
4957247 Update sim missing message in lock screen. by John Wang · 13 years ago
71afd5e Merge "VPN: tolerate duplicated routes." by Chia-chi Yeh · 13 years ago
c2ab0d6 Switch is not affected by touch when disabled by Gilles Debunne · 13 years ago
23a5e4b VPN: tolerate duplicated routes. by Chia-chi Yeh · 13 years ago
328958c Merge "VPN: fix a bad optimization of zeroing ifr_flags lately." by Chia-chi Yeh · 13 years ago
6ddd574 VPN: fix a bad optimization of zeroing ifr_flags lately. by Chia-chi Yeh · 13 years ago
9b8e196 Temporarily don't return the current buffer in synchronous mode by Mathias Agopian · 13 years ago
7bb843c unify SurfaceTexture and Surface by Mathias Agopian · 13 years ago
10e78c9 am f11c52d2: Updates resulting from the Skia merge (revision 1327) by Derek Sollenberger · 13 years ago
72171ad am c031afc8: (-s ours) am 77079399: am a9c9a4ba: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE) by Mathias Agopian · 13 years ago
c9a7f1d am c793f521: Merge/Ignore 653fd9cf by Jean-Baptiste Queru · 13 years ago
fa56409 am 74e646ca: (-s ours) Fix merge conflict for \'c2e1e329\'. by Dan Morrill · 13 years ago
0b6cca4 Merge "VPN: set IFF_NO_PI on TUN interface." by Chia-chi Yeh · 13 years ago
6224b5e VPN: set IFF_NO_PI on TUN interface. by Chia-chi Yeh · 13 years ago
26cfe80 Merge "VPN: add MTU support." by Chia-chi Yeh · 13 years ago
f11c52d Updates resulting from the Skia merge (revision 1327) by Derek Sollenberger · 13 years ago
3663227 VPN: add MTU support. by Chia-chi Yeh · 13 years ago
716a38a Merge changes Ic9186db2,Id5a7cdff by Jamie Gennis · 13 years ago
49edc10 Merge "VPN: use ParcelFileDescriptor.adoptFd() instead of doing it in JNI." by Chia-chi Yeh · 13 years ago
3667369 VPN: use ParcelFileDescriptor.adoptFd() instead of doing it in JNI. by Chia-chi Yeh · 13 years ago
c282401 Merge "Final polish of the interrogation feature." by Svetoslav Ganov · 13 years ago
cc5278a Support for setting a ParcelSurfaceTexture as the MediaPlayer sink. by tedbo · 13 years ago
c031afc am 77079399: am a9c9a4ba: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE) by Mathias Agopian · 13 years ago
7707939 am a9c9a4ba: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE) by Mathias Agopian · 13 years ago
2f911b7 Merge "Remove @hide on SyncColumns, make them protected" by RoboErik · 13 years ago
0025860 Remove @hide on SyncColumns, make them protected by RoboErik · 13 years ago
a9c9a4b fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE) by Mathias Agopian · 13 years ago
323badd SurfaceTexture: disable a deadlocking test. by Jamie Gennis · 13 years ago
43bdc23 SurfaceTexture: add a pixel tolerance to the tests. by Jamie Gennis · 13 years ago
0fe7b26 Merge "Make interfaces protected so they get included in api" by RoboErik · 13 years ago
b2c7560 Make interfaces protected so they get included in api by RoboErik · 13 years ago
dfc7958 Merge "libutils: add a binary blob cache implementation." by Jamie Gennis · 13 years ago
c793f52 Merge/Ignore 653fd9cf by Jean-Baptiste Queru · 13 years ago
fde45f58 Merge "Support for setting the NfcA transceive timeout (API)." by Martijn Coenen · 13 years ago
74e646c Fix merge conflict for 'c2e1e329'. by Dan Morrill · 13 years ago
9d9f237 Merge "Update Configuration for renaming and fixes" by Fabrice Di Meglio · 13 years ago
bd3e537 Merge changes I56779420,I044e44e1,Ic5adfa29,Ied541ab8 by Jamie Gennis · 13 years ago
28b6711 Merge "Bugfix for GridLayout assuming that the x value of last column index is maximal. This is not the case when column indexes are defined incorrectly and GridLayout should still work in this case." by Philip Milne · 13 years ago
7abf5a6 Merge "Tweaks for webview snap" by John Reck · 13 years ago
ee32eed Merge "Fix driver start/stop handling" by Irfan Sheriff · 13 years ago
3159886 Merge "Fix a NPE if the Chrome Client is not setup" by Teng-Hui Zhu · 13 years ago
9deb930 SurfaceTexture: add some GL->GL tests. by Jamie Gennis · 13 years ago
4e03d32 SurfaceTexture: fix up a comment. by Jamie Gennis · 13 years ago
15e0d9f SurfaceTexture: add getTransformMatrix tests. by Jamie Gennis · 13 years ago
eadfb67 SurfaceTexture: fix a getTransformMatrix crash. by Jamie Gennis · 13 years ago