Derek Sollenberger
|
4ede4f743f
|
am 5b98d3a7: am e91c8d04: Added interface to SurfaceTexture needed by WebKit.
* commit '5b98d3a70d64c46b8d925415a30a7a7d8453d866':
Added interface to SurfaceTexture needed by WebKit.
|
2011-09-11 07:41:37 -07:00 |
|
Derek Sollenberger
|
42382dd8a7
|
am e91c8d04: Added interface to SurfaceTexture needed by WebKit.
* commit 'e91c8d0414333e4686a4473aaf1d8b1b1e0ba291':
Added interface to SurfaceTexture needed by WebKit.
|
2011-09-11 07:35:00 -07:00 |
|
Derek Sollenberger
|
136593f2ea
|
Added interface to SurfaceTexture needed by WebKit.
bug: 5239378
Change-Id: I2d84c95c481515621d2b24a36bc213f4ea5d721a
|
2011-09-08 15:03:09 -04:00 |
|
Xavier Ducrohet
|
97dfe9fcc1
|
am 9d829f98: am 21e6e2de: Merge "Change generated dependency file names"
* commit '9d829f98dc19edecb2305b61b9c79517c4f95383':
Change generated dependency file names
|
2011-08-18 14:45:36 -07:00 |
|
Xavier Ducrohet
|
4141bb21e7
|
am 21e6e2de: Merge "Change generated dependency file names"
* commit '21e6e2de1f0062f949fcc52d0b4559dfa3246e0e':
Change generated dependency file names
|
2011-08-18 14:41:56 -07:00 |
|
Xavier Ducrohet
|
bcb124929a
|
Merge "Change generated dependency file names"
|
2011-08-18 14:29:15 -07:00 |
|
Jaikumar Ganesh
|
7d4e0c49f6
|
am 6f6b21b4: am 4733d3a6: Merge "Bluetooth event loop dispatches dbus data on wakeup"
* commit '6f6b21b407a8883b92b3de9e028e4dc1550b9648':
Bluetooth event loop dispatches dbus data on wakeup
|
2011-08-18 12:08:05 -07:00 |
|
Jaikumar Ganesh
|
56b33ee2ed
|
am 4733d3a6: Merge "Bluetooth event loop dispatches dbus data on wakeup"
* commit '4733d3a6bf10334c93ffbf42e6e850cacbaadd55':
Bluetooth event loop dispatches dbus data on wakeup
|
2011-08-18 12:06:25 -07:00 |
|
Jaikumar Ganesh
|
7be5106263
|
Merge "Bluetooth event loop dispatches dbus data on wakeup"
|
2011-08-18 12:02:35 -07:00 |
|
Xavier Ducrohet
|
242915f3d0
|
am 88512f59: am a8313e71: Merge "Fix String16 operator+ to actually work"
* commit '88512f59bc051a42f4dd70acc8af5622f7e99db6':
Fix String16 operator+ to actually work
|
2011-08-17 14:35:20 -07:00 |
|
Xavier Ducrohet
|
35302266fa
|
am a8313e71: Merge "Fix String16 operator+ to actually work"
* commit 'a8313e71fe8b483448d14e22610101c5f3672744':
Fix String16 operator+ to actually work
|
2011-08-17 14:31:08 -07:00 |
|
Xavier Ducrohet
|
9f4d9d148f
|
Merge "Fix String16 operator+ to actually work"
|
2011-08-17 14:18:04 -07:00 |
|
Dianne Hackborn
|
bf046a8e05
|
am 7a0d746b: am baaf3ce6: Merge "Handle stopping of services with still bound applications."
* commit '7a0d746bf2eaca4ff9d150e2cd2604b72ec5a2cb':
Handle stopping of services with still bound applications.
|
2011-08-16 20:42:17 -07:00 |
|
Dianne Hackborn
|
e0233e99cd
|
am baaf3ce6: Merge "Handle stopping of services with still bound applications."
* commit 'baaf3ce6385da0f9f5ff6e2195e26c339ee9949e':
Handle stopping of services with still bound applications.
|
2011-08-16 20:39:50 -07:00 |
|
Dianne Hackborn
|
96fe23ed7b
|
Merge "Handle stopping of services with still bound applications."
|
2011-08-16 19:29:25 -07:00 |
|
Josiah Gaskin
|
37bf88e547
|
Fix String16 operator+ to actually work
This change fixes the String16 utility's operator+ function.
Change-Id: Ibed7b07277b50bf178febc72b6ce497893e66f17
|
2011-08-16 15:16:04 -07:00 |
|
Jean-Baptiste Queru
|
37717b58dc
|
am b654e6e5: am d144748d: Merge "Add missing include"
* commit 'b654e6e55a3e8d7e8c2e0b8b1ff4bb4f76c10e05':
Add missing include
|
2011-08-11 15:22:42 -07:00 |
|
Jean-Baptiste Queru
|
e636a8ad44
|
am d144748d: Merge "Add missing include"
* commit 'd144748d4767b2ccfb13857e23f78bc944e9531d':
Add missing include
|
2011-08-11 15:18:22 -07:00 |
|
Jean-Baptiste Queru
|
dbd5be5408
|
Merge "Add missing include"
|
2011-08-11 13:46:09 -07:00 |
|
Jean-Baptiste Queru
|
2327ffac7d
|
Add missing include
Change-Id: I00181029e80a2ba75320550c14e950fadbab8a64
|
2011-08-11 13:36:04 -07:00 |
|
Amith Yamasani
|
23f1724cf7
|
am 5f074067: am 712a8cca: Merge "VolumePreference.onActivityStop only stops playback"
* commit '5f07406717db34927f5095de3829b1e74ebd7c16':
VolumePreference.onActivityStop only stops playback
|
2011-08-11 12:46:25 -07:00 |
|
Amith Yamasani
|
49934b48b3
|
am 712a8cca: Merge "VolumePreference.onActivityStop only stops playback"
* commit '712a8cca1f9e438af224f93c3a4644853331af2e':
VolumePreference.onActivityStop only stops playback
|
2011-08-11 12:43:44 -07:00 |
|
Amith Yamasani
|
431d7beafe
|
Merge "VolumePreference.onActivityStop only stops playback"
|
2011-08-11 12:29:34 -07:00 |
|
Jean-Baptiste Queru
|
65adf39c38
|
am 44874c23: am c962512c: Merge "added stub for getting buffer from surface texture"
* commit '44874c236de282b0d898f179fc9fdafa84aae40d':
added stub for getting buffer from surface texture
|
2011-08-11 12:24:51 -07:00 |
|
Jean-Baptiste Queru
|
9f3a33a671
|
am c962512c: Merge "added stub for getting buffer from surface texture"
* commit 'c962512cac19e2bb1103c0c1a5f739d40d4d7740':
added stub for getting buffer from surface texture
|
2011-08-11 12:19:44 -07:00 |
|
Jean-Baptiste Queru
|
cff1acf568
|
Merge "added stub for getting buffer from surface texture"
|
2011-08-11 12:08:04 -07:00 |
|
Chris Craik
|
f81c168a7a
|
added stub for getting buffer from surface texture
Change-Id: If61153cacdd8027848f40f8d9035f7c4aead0a98
|
2011-08-11 11:56:59 -07:00 |
|
Jeff Brown
|
9f213739b9
|
am ca97671e: am 6f5a837c: Merge "Fix getSwitchState according to device capabilities."
* commit 'ca97671e2b74ed31b5bef6fd0b39e489f1ec5f51':
Fix getSwitchState according to device capabilities.
|
2011-08-10 13:59:44 -07:00 |
|
Jeff Brown
|
04eb1755a2
|
am 7e79b9aa: am dbff9107: Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4437846"
* commit '7e79b9aad85db332d334f8bc1625bf46f030830f':
Support wrapping app processes to inject debug instrumentation. Bug: 4437846
|
2011-08-10 13:59:41 -07:00 |
|
Jeff Brown
|
38b77d4373
|
am 6f5a837c: Merge "Fix getSwitchState according to device capabilities."
* commit '6f5a837c9c4a55c82111c6cd5af6055b63fcb5a9':
Fix getSwitchState according to device capabilities.
|
2011-08-10 13:56:33 -07:00 |
|
Jeff Brown
|
4af616cb5a
|
am dbff9107: Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4437846"
* commit 'dbff91077ddf437b62794e077d2ce9e10fff8170':
Support wrapping app processes to inject debug instrumentation. Bug: 4437846
|
2011-08-10 13:56:31 -07:00 |
|
Jeff Brown
|
c6d6863c9b
|
Merge "Fix getSwitchState according to device capabilities."
|
2011-08-10 13:42:03 -07:00 |
|
Jeff Brown
|
091c0f7ece
|
Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4437846"
|
2011-08-10 13:41:36 -07:00 |
|
Gloria Wang
|
7d4af3fefc
|
am 4e197ea8: am e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"
* commit '4e197ea8a6c5d5f4393a474591cccdd3fa27ecde':
Bug fixes in OMA DRM v1 Forward Lock Agent
|
2011-08-04 14:36:45 -07:00 |
|
Gloria Wang
|
fe70827b1b
|
am e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"
* commit 'e15a73ee4c9a28d89888095c7649a70c116ee160':
Bug fixes in OMA DRM v1 Forward Lock Agent
|
2011-08-04 14:33:06 -07:00 |
|
Gloria Wang
|
0e3e14faf6
|
Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"
|
2011-08-04 14:20:53 -07:00 |
|
Xavier Ducrohet
|
480f4bbb2b
|
am b9e8b25e: am 6b3a0123: Merge "Insert a break wraparound."
* commit 'b9e8b25e9066d6f2da0635eaac524246b729fbfa':
Insert a break wraparound.
|
2011-08-04 12:52:34 -07:00 |
|
Xavier Ducrohet
|
1966e6faeb
|
am 6b3a0123: Merge "Insert a break wraparound."
* commit '6b3a0123486e729aca7e7de0c3a78c4c3300d0c9':
Insert a break wraparound.
|
2011-08-04 12:50:11 -07:00 |
|
Xavier Ducrohet
|
a62b24752b
|
Merge "Insert a break wraparound."
|
2011-08-04 12:36:11 -07:00 |
|
Mike Lockwood
|
1631bf5358
|
am a82ee49a: am 8f5dd9ad: Merge "GPS Provider Service changes"
* commit 'a82ee49a7b130ffe3199a488c7bb0ca4464af64c':
GPS Provider Service changes
|
2011-08-04 07:51:38 -07:00 |
|
Mike Lockwood
|
c2c411d9cf
|
am 8f5dd9ad: Merge "GPS Provider Service changes"
* commit '8f5dd9ad3f98d97d2862b57ba8cd961d2201e40c':
GPS Provider Service changes
|
2011-08-04 07:48:57 -07:00 |
|
Mike Lockwood
|
fca789ba5f
|
Merge "GPS Provider Service changes"
|
2011-08-04 07:39:03 -07:00 |
|
Jean-Baptiste Queru
|
6b115451bf
|
am 98c531dc: am 9b0c6bee: Merge "Fix a compiling error when trying to use setBufferCount"
* commit '98c531dca9e52af280ca002658bbe38775b3f6ae':
Fix a compiling error when trying to use setBufferCount
|
2011-08-02 17:19:05 -07:00 |
|
Jean-Baptiste Queru
|
8fdbdf461a
|
am 9b0c6bee: Merge "Fix a compiling error when trying to use setBufferCount"
* commit '9b0c6beed2cd5463655712ad80ed160c08611ff8':
Fix a compiling error when trying to use setBufferCount
|
2011-08-02 17:15:24 -07:00 |
|
Jean-Baptiste Queru
|
8fdba3dd72
|
Merge "Fix a compiling error when trying to use setBufferCount"
|
2011-08-02 17:02:48 -07:00 |
|
Teng-Hui Zhu
|
697bce061c
|
Fix a compiling error when trying to use setBufferCount
Change-Id: I1aefaf7ec111340a584e0beeeea60b845e16bb1f
|
2011-08-02 16:57:20 -07:00 |
|
Conley Owens
|
526587bb72
|
am e1d27154: am f87743e7: Merge "Prevent NullPointerException cases while using SipService."
* commit 'e1d271546767a8e2213aabba92506af9e97020b4':
Prevent NullPointerException cases while using SipService.
|
2011-08-02 13:24:00 -07:00 |
|
Conley Owens
|
6662266a42
|
am f87743e7: Merge "Prevent NullPointerException cases while using SipService."
* commit 'f87743e7bdfd10b9a1719036a6320a32df078879':
Prevent NullPointerException cases while using SipService.
|
2011-08-02 13:21:12 -07:00 |
|
Conley Owens
|
b1d918badd
|
Merge "Prevent NullPointerException cases while using SipService."
|
2011-08-02 13:08:14 -07:00 |
|
Jean-Baptiste Queru
|
0581cb2681
|
am a2616220: am 5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer."
* commit 'a2616220d24b994e79fcbf33f7ce8a311fa9e8ac':
Stagefright: Return error if codec takes too long to return a buffer.
|
2011-08-01 13:59:02 -07:00 |
|