OSDN Git Service
Jason Sams [Fri, 10 Feb 2012 23:27:26 +0000 (15:27 -0800)]
resolved conflicts for merge of
cb66aec0 to graphics-dev
Change-Id: Ic8817f702b6993f046c89f2fc598c9fe3bf30fe8
Glenn Kasten [Fri, 10 Feb 2012 21:52:03 +0000 (13:52 -0800)]
am
1137be1a: Follow raw pointer and sp<> conventions
* commit '
1137be1a686fdfc9f02c3aca7c33f28006df4742':
Follow raw pointer and sp<> conventions
Jason Sams [Fri, 10 Feb 2012 21:51:04 +0000 (13:51 -0800)]
Merge "Start implementing SurfaceTexture streaming into RS allocations."
Glenn Kasten [Fri, 10 Feb 2012 21:37:57 +0000 (13:37 -0800)]
am
5dd4754f: Merge "No newline or space at end of ALOG format string"
* commit '
5dd4754f58e5e99f893749ab3bb3eda1de4cfbe7':
No newline or space at end of ALOG format string
Glenn Kasten [Fri, 10 Feb 2012 21:36:24 +0000 (13:36 -0800)]
Merge "No newline or space at end of ALOG format string"
Glenn Kasten [Fri, 10 Feb 2012 21:34:41 +0000 (13:34 -0800)]
am
c1513f42: Merge "Move declaration of stream_type_t up earlier"
* commit '
c1513f42eecca54c385a6e63abe6ddcfff5c911c':
Move declaration of stream_type_t up earlier
Glenn Kasten [Fri, 10 Feb 2012 21:34:39 +0000 (13:34 -0800)]
am
80d0a9db: Merge "Fix typos in ALOG for pid vs tid"
* commit '
80d0a9db5509c492a5c42f2efdd1a55b256d5838':
Fix typos in ALOG for pid vs tid
Glenn Kasten [Fri, 10 Feb 2012 21:33:31 +0000 (13:33 -0800)]
Merge "Move declaration of stream_type_t up earlier"
Glenn Kasten [Fri, 10 Feb 2012 21:33:02 +0000 (13:33 -0800)]
Merge "Fix typos in ALOG for pid vs tid"
Glenn Kasten [Fri, 10 Feb 2012 21:32:34 +0000 (13:32 -0800)]
am
9fd2d6b1: Merge "Rename type() to streamType()"
* commit '
9fd2d6b1a65759ea123320353adb0f4685429b4d':
Rename type() to streamType()
Glenn Kasten [Fri, 10 Feb 2012 21:30:24 +0000 (13:30 -0800)]
Merge "Rename type() to streamType()"
Eric Fischer [Fri, 10 Feb 2012 21:17:31 +0000 (13:17 -0800)]
am
7aedd945: am
5b6f9bf5: (-s ours) am
8b6d7b06: am
650462bb: Import revised translations. DO NOT MERGE
* commit '
7aedd945ed1727a4ad77f663baee1e32342d2ada':
Eric Fischer [Fri, 10 Feb 2012 21:17:29 +0000 (13:17 -0800)]
am
c3b20274: am
ffb2473b: (-s ours) am
a2c92418: am
650462bb: Import revised translations. DO NOT MERGE
* commit '
c3b2027498a40cb1e31bacbff4133b9079913161':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 21:15:26 +0000 (13:15 -0800)]
am
5b6f9bf5: (-s ours) am
8b6d7b06: am
650462bb: Import revised translations. DO NOT MERGE
* commit '
5b6f9bf51c13532acac782a23506cb0b783b8876':
Eric Fischer [Fri, 10 Feb 2012 21:15:23 +0000 (13:15 -0800)]
am
ffb2473b: (-s ours) am
a2c92418: am
650462bb: Import revised translations. DO NOT MERGE
* commit '
ffb2473b3bd8a4986e41ff0a711e708656432eaf':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 21:13:58 +0000 (13:13 -0800)]
am
8b6d7b06: am
650462bb: Import revised translations. DO NOT MERGE
* commit '
8b6d7b063b5a94b59b4a1132763f4644ee1d8545':
Eric Fischer [Fri, 10 Feb 2012 21:13:30 +0000 (13:13 -0800)]
am
a2c92418: am
650462bb: Import revised translations. DO NOT MERGE
* commit '
a2c9241869c14a058621668d65ca29fc8a867bbf':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 21:11:46 +0000 (13:11 -0800)]
am
650462bb: Import revised translations. DO NOT MERGE
* commit '
650462bbfd6218c918cd9507ea0a33fa9a936f26':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 21:11:45 +0000 (13:11 -0800)]
am
650462bb: Import revised translations. DO NOT MERGE
* commit '
650462bbfd6218c918cd9507ea0a33fa9a936f26':
Import revised translations. DO NOT MERGE
Dianne Hackborn [Fri, 10 Feb 2012 21:09:47 +0000 (13:09 -0800)]
am
16e19ce9: Merge "Clean up and expose LongSparseArray."
* commit '
16e19ce9190791d5e45d71f2810529691e1f44be':
Clean up and expose LongSparseArray.
Dianne Hackborn [Fri, 10 Feb 2012 21:07:54 +0000 (13:07 -0800)]
Merge "Clean up and expose LongSparseArray."
Mike Lockwood [Fri, 10 Feb 2012 21:07:41 +0000 (13:07 -0800)]
am
aab002bd: Merge changes I54a4a41a,Ic067c9c3,I491f40dd,I3a2ce935,I3df2549c,Icba928ce
* commit '
aab002bdd4b86a6564d1a5fb4d6b8c6958eaf104':
Make ActivityManagerService just kill apps when they crash on headless devices.
Add support for disabling wallpaper service
Fix merge problem
Add the ability to pass float extras to AM.
Adding a feature to indicate specific support for Bluetooth API.
SystemServer: Add support for disabling AudioService and MountService
Mike Lockwood [Fri, 10 Feb 2012 21:05:14 +0000 (13:05 -0800)]
am
ab3ea05d: Merge "BatteryService: Don\'t fail to register native methods if kernel power supply driver is missing"
* commit '
ab3ea05d63cb987639d03a0e2a8fdbc8e93c5c25':
BatteryService: Don't fail to register native methods if kernel power supply driver is missing
Mike Lockwood [Fri, 10 Feb 2012 21:05:13 +0000 (13:05 -0800)]
Merge changes I54a4a41a,Ic067c9c3,I491f40dd,I3a2ce935,I3df2549c,Icba928ce
* changes:
Make ActivityManagerService just kill apps when they crash on headless devices.
Add support for disabling wallpaper service
Fix merge problem
Add the ability to pass float extras to AM.
Adding a feature to indicate specific support for Bluetooth API.
SystemServer: Add support for disabling AudioService and MountService
Mike Lockwood [Fri, 10 Feb 2012 21:03:24 +0000 (13:03 -0800)]
Merge "BatteryService: Don't fail to register native methods if kernel power supply driver is missing"
Eric Fischer [Fri, 10 Feb 2012 20:56:45 +0000 (12:56 -0800)]
am
598465d3: Merge "Import translations."
* commit '
598465d374bc31a9d25536f9a41825c83369832f':
Import translations.
Eric Fischer [Fri, 10 Feb 2012 20:54:21 +0000 (12:54 -0800)]
Merge "Import translations."
Eric Fischer [Fri, 10 Feb 2012 20:53:09 +0000 (12:53 -0800)]
Merge "Import translations. DO NOT MERGE" into graphics-dev
Mike Lockwood [Fri, 10 Feb 2012 19:51:52 +0000 (11:51 -0800)]
am
11ca3172: Merge changes Id747dc81,I3a74bd36,I2395527c,I86aeb066,Ic33d5766,I7bef7390,I4b797dd8,Id3622e9e,I28087c63,Ia1c6d909,I95a766dd,I6c0236c5,Ib71287f4,I4bcbefdc,I22a7cb8d,Ie24dbeaf,I7dbc4b45,I21d524ea,Iaa5bf14e,I7db766c3,I93fcaca2,I1eb72044,I05ffbe7c,Ifdfe2ff8,I
* commit '
11ca31729c05a5c82aa298fb52ddebbe08a26627': (25 commits)
Fix problems dispatching media button events on headless devices
Add headless mode for running the framework without the surface flinger
SettingsProvider: Allow overridding default value for Setttings.Secure.DEVICE_PROVISIONED
Load lockscreen.disabled setting on database create as well as upgrade
SystemUI: Log an error instead of throwing an exception if navigation bar is enabled in tablet UI
SettingsProvider: Add support for overriding lockscreen.disabled default value
Allow overriding default STAY_ON_WHILE_PLUGGED_IN setting value in an overlay
Disable output processing when opening serial port.
Update aidl for new Broker API.
aidl: All flattenable types now must also be parcelable.
Update aidl to new APIs.
Suport RpcData as a parcelable type.
Modified AIDL to support authentication
Fix disconnect from wired ethernet issues.
Fix PresenterClass by adding a _listener field
add presenters to aidl.
Add SerialPort.sendBreak()
Generate fallthrough for unhandled actions in RPC methods.
PhoneWindowManager: Disable boot progress dialog on headless builds
Support custom flattenable types for RPC.
...
Mike Lockwood [Fri, 10 Feb 2012 19:50:10 +0000 (11:50 -0800)]
Merge changes Id747dc81,I3a74bd36,I2395527c,I86aeb066,Ic33d5766,I7bef7390,I4b797dd8,Id3622e9e,I28087c63,Ia1c6d909,I95a766dd,I6c0236c5,Ib71287f4,I4bcbefdc,I22a7cb8d,Ie24dbeaf,I7dbc4b45,I21d524ea,Iaa5bf14e,I7db766c3,I93fcaca2,I1eb72044,I05ffbe7c,Ifdfe2ff8,Ia8f767a2
* changes:
Fix problems dispatching media button events on headless devices
Add headless mode for running the framework without the surface flinger
SettingsProvider: Allow overridding default value for Setttings.Secure.DEVICE_PROVISIONED
Load lockscreen.disabled setting on database create as well as upgrade
SystemUI: Log an error instead of throwing an exception if navigation bar is enabled in tablet UI
SettingsProvider: Add support for overriding lockscreen.disabled default value
Allow overriding default STAY_ON_WHILE_PLUGGED_IN setting value in an overlay
Disable output processing when opening serial port.
Update aidl for new Broker API.
aidl: All flattenable types now must also be parcelable.
Update aidl to new APIs.
Suport RpcData as a parcelable type.
Modified AIDL to support authentication
Fix disconnect from wired ethernet issues.
Fix PresenterClass by adding a _listener field
add presenters to aidl.
Add SerialPort.sendBreak()
Generate fallthrough for unhandled actions in RPC methods.
PhoneWindowManager: Disable boot progress dialog on headless builds
Support custom flattenable types for RPC.
SystemServer: Don't start A2DP service if audio is not enabled
Add RpcData as a built-in marshallable type.
Add the full suite of RpcData types.
Checkpoint adding @home RPC support to aidl
ActivityManager: Make sure BOOT_COMPLETED Intent is sent when running headless
Mike Lockwood [Fri, 10 Feb 2012 19:44:33 +0000 (11:44 -0800)]
am
adf7c11e: Merge "Quick and dirty test app for new SerialPort API"
* commit '
adf7c11e56e84531a3f4e9097cb05db663d7d246':
Quick and dirty test app for new SerialPort API
Mike Lockwood [Fri, 10 Feb 2012 19:44:29 +0000 (11:44 -0800)]
am
1e11c651: Merge "New Serial Manager API:"
* commit '
1e11c6519a5b657ad6af4369b8580fbe681ebe0e':
New Serial Manager API:
Mike Lockwood [Fri, 10 Feb 2012 19:41:56 +0000 (11:41 -0800)]
Merge "Quick and dirty test app for new SerialPort API"
Mike Lockwood [Fri, 10 Feb 2012 19:41:41 +0000 (11:41 -0800)]
Merge "New Serial Manager API:"
Dianne Hackborn [Fri, 10 Feb 2012 19:17:01 +0000 (11:17 -0800)]
am
d262744b: Merge "Some cruft removal."
* commit '
d262744b7e4fd9e01a9a0a5d70927328e9391bf9':
Some cruft removal.
Dianne Hackborn [Fri, 10 Feb 2012 19:14:39 +0000 (11:14 -0800)]
Merge "Some cruft removal."
Justin Ho [Fri, 10 Feb 2012 18:55:17 +0000 (10:55 -0800)]
am
f59f92f1: am
25d1d268: (-s ours) am
0fc225ed: am
744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '
f59f92f1ac33e39a3cba2a060cbf360d4b681a4d':
Justin Ho [Fri, 10 Feb 2012 18:51:52 +0000 (10:51 -0800)]
am
25d1d268: (-s ours) am
0fc225ed: am
744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '
25d1d268c1b00734f4bdd7fcb85ced97645a7f29':
Justin Ho [Fri, 10 Feb 2012 18:49:48 +0000 (10:49 -0800)]
am
0fc225ed: am
744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '
0fc225ed37ec535ff9b5238f390a79dbaf7f377b':
Justin Ho [Fri, 10 Feb 2012 18:22:40 +0000 (10:22 -0800)]
am
341ff2b0: am
f994f353: (-s ours) am
448249d1: (-s ours) am
744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '
341ff2b08380fcab0f2313fb4feca732cf70f840':
Import translations. DO NOT MERGE
Justin Ho [Fri, 10 Feb 2012 18:19:58 +0000 (10:19 -0800)]
am
f994f353: (-s ours) am
448249d1: (-s ours) am
744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '
f994f353f705dc69c1e57bd6785092218fd630d2':
Import translations. DO NOT MERGE
Mike Lockwood [Fri, 10 Feb 2012 18:15:45 +0000 (10:15 -0800)]
am
8dc1dabd: VolumePanel: Add support for master volume
* commit '
8dc1dabd254249b7ddb8743e88fdb96580ffc585':
VolumePanel: Add support for master volume
Mike Lockwood [Fri, 10 Feb 2012 18:15:43 +0000 (10:15 -0800)]
am
8517e46f: Save and restore master volume in the settings provider
* commit '
8517e46f3d3c2ce11de09aa849a8533ffc1a2026':
Save and restore master volume in the settings provider
Justin Ho [Fri, 10 Feb 2012 18:13:19 +0000 (10:13 -0800)]
am
448249d1: (-s ours) am
744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '
448249d1a7e0b871b9a9db49a45e0e51f6d36d65':
Import translations. DO NOT MERGE
Justin Ho [Fri, 10 Feb 2012 18:10:39 +0000 (10:10 -0800)]
am
744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '
744c5b0bdee6a26e2dc7e740a695d53c32104326':
Import translations. DO NOT MERGE
Justin Ho [Fri, 10 Feb 2012 18:09:42 +0000 (10:09 -0800)]
am
744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '
744c5b0bdee6a26e2dc7e740a695d53c32104326':
Import translations. DO NOT MERGE
Justin Ho [Fri, 10 Feb 2012 18:07:07 +0000 (10:07 -0800)]
Merge "Import translations. DO NOT MERGE" into ics-mr1
Mike Lockwood [Fri, 10 Feb 2012 17:07:35 +0000 (09:07 -0800)]
am
cbdb49dc: Simple master volume support
* commit '
cbdb49dc5e1b993a0bc5c68dbfb9486bfa0cd762':
Simple master volume support
Marco Nelissen [Fri, 10 Feb 2012 15:14:41 +0000 (07:14 -0800)]
am
c62242a5: Merge "Fix "dumpsys activity provider""
* commit '
c62242a55a5cfb82f69c7db5208e90667da7ec56':
Fix "dumpsys activity provider"
Marco Nelissen [Fri, 10 Feb 2012 15:13:23 +0000 (07:13 -0800)]
Merge "Fix "dumpsys activity provider""
satok [Fri, 10 Feb 2012 10:25:02 +0000 (02:25 -0800)]
am
59d46b06: Merge "Add an api to switch to the next IME and subtype"
* commit '
59d46b06653b5f55c2f26d3ff8d642ffda0cecd8':
Add an api to switch to the next IME and subtype
satok [Fri, 10 Feb 2012 10:22:57 +0000 (02:22 -0800)]
Merge "Add an api to switch to the next IME and subtype"
James Dong [Fri, 10 Feb 2012 07:55:45 +0000 (23:55 -0800)]
am
55ee8415: Merge "move away from MediaDebug and use ADebug instead for video editor engine"
* commit '
55ee84154b3afe07afef6311f707928856840f89':
move away from MediaDebug and use ADebug instead for video editor engine
James Dong [Fri, 10 Feb 2012 07:53:50 +0000 (23:53 -0800)]
Merge "move away from MediaDebug and use ADebug instead for video editor engine"
Scott Main [Fri, 10 Feb 2012 05:11:02 +0000 (21:11 -0800)]
Joe Fernandez [Fri, 10 Feb 2012 05:11:00 +0000 (21:11 -0800)]
am
f1908925: am
d2deae8f: am
a300ea98: am
1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)" into ics-mr1
* commit '
f19089259ecd6627cd4703ab55b5df8a4f4644a7':
Scott Main [Fri, 10 Feb 2012 05:10:57 +0000 (21:10 -0800)]
am
6b9f68ac: am
758fe151: am
cf18f420: am
52bfc243: docs: fix misc doc bugs from external issue tracker
* commit '
6b9f68ac89615505ac24f8c00d3fddc4ff43b58b':
Scott Main [Fri, 10 Feb 2012 05:09:01 +0000 (21:09 -0800)]
Joe Fernandez [Fri, 10 Feb 2012 05:08:59 +0000 (21:08 -0800)]
am
d2deae8f: am
a300ea98: am
1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)" into ics-mr1
* commit '
d2deae8f40d33ad69d92963a7fceb90ee3cae1ad':
Scott Main [Fri, 10 Feb 2012 05:08:58 +0000 (21:08 -0800)]
am
758fe151: am
cf18f420: am
52bfc243: docs: fix misc doc bugs from external issue tracker
* commit '
758fe1511e499099deddcb94994b5d9a332062e1':
Scott Main [Fri, 10 Feb 2012 05:07:10 +0000 (21:07 -0800)]
Joe Fernandez [Fri, 10 Feb 2012 05:07:08 +0000 (21:07 -0800)]
am
a300ea98: am
1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)" into ics-mr1
* commit '
a300ea98df80a2d72d6131902a8fb3dbf9a6ed14':
Scott Main [Fri, 10 Feb 2012 05:07:08 +0000 (21:07 -0800)]
am
cf18f420: am
52bfc243: docs: fix misc doc bugs from external issue tracker
* commit '
cf18f42026b6dea9e1ec2f243718a6b7aebae3a2':
Dianne Hackborn [Fri, 10 Feb 2012 02:10:48 +0000 (18:10 -0800)]
am
d10035d5: Merge "Some hardening of isolated processes by restricting access to services."
* commit '
d10035d52bcd4eed9f83cad580d606cd522dd6c7':
Some hardening of isolated processes by restricting access to services.
Dianne Hackborn [Fri, 10 Feb 2012 02:08:38 +0000 (18:08 -0800)]
Merge "Some hardening of isolated processes by restricting access to services."
Dianne Hackborn [Fri, 10 Feb 2012 00:12:18 +0000 (16:12 -0800)]
Some hardening of isolated processes by restricting access to services.
Services now must explicitly opt in to being accessed by isolated
processes. Currently only the activity manager and surface flinger
allow this. Activity manager is needed so that we can actually
bring up the process; SurfaceFlinger is needed to be able to get the
display information for creating the Configuration. The SurfaceFlinger
should be safe because the app doesn't have access to the window
manager so can't actually get a surface to do anything with.
The activity manager now protects most of its entry points against
isolated processes.
Change-Id: I0dad8cb2c873575c4c7659c3c2a7eda8e98f46b0
Fabrice Di Meglio [Fri, 10 Feb 2012 01:36:41 +0000 (17:36 -0800)]
am
8bb8dc9b: Merge "Update BiDiTests app"
* commit '
8bb8dc9b5f67d6c82d18da4ea46053ea80b75c84':
Update BiDiTests app
Fabrice Di Meglio [Fri, 10 Feb 2012 01:35:21 +0000 (17:35 -0800)]
Merge "Update BiDiTests app"
Scott Main [Fri, 10 Feb 2012 00:08:36 +0000 (16:08 -0800)]
Scott Main [Fri, 10 Feb 2012 00:06:31 +0000 (16:06 -0800)]
Scott Main [Fri, 10 Feb 2012 00:04:15 +0000 (16:04 -0800)]
am
db7da7ee: am
d9c8bbd5: docs: fix xss issue bug
5125642
* commit '
db7da7ee40231225861f4d39ea2f256bbca06f24':
docs: fix xss issue bug
5125642
Scott Main [Fri, 10 Feb 2012 00:01:51 +0000 (16:01 -0800)]
am
d9c8bbd5: docs: fix xss issue bug
5125642
* commit '
d9c8bbd56a9c76a111f9441871e79516c521aa75':
docs: fix xss issue bug
5125642
Scott Main [Fri, 10 Feb 2012 00:01:38 +0000 (16:01 -0800)]
am
d9c8bbd5: docs: fix xss issue bug
5125642
* commit '
d9c8bbd56a9c76a111f9441871e79516c521aa75':
docs: fix xss issue bug
5125642
James Dong [Thu, 9 Feb 2012 23:24:32 +0000 (15:24 -0800)]
am
4f0106cc: Merge "Finish up B frame support in MPEG4Writer"
* commit '
4f0106cca0c40cd506367c894436f91c4920a5e1':
Finish up B frame support in MPEG4Writer
James Dong [Thu, 9 Feb 2012 23:22:58 +0000 (15:22 -0800)]
Merge "Finish up B frame support in MPEG4Writer"
Jason Sams [Thu, 9 Feb 2012 23:19:10 +0000 (15:19 -0800)]
am
468a9715: Merge "Remove unused param."
* commit '
468a971512f4665b13e83cc3c7dc24c9031b14eb':
Remove unused param.
Jason Sams [Thu, 9 Feb 2012 23:17:27 +0000 (15:17 -0800)]
Merge "Remove unused param."
Andreas Huber [Thu, 9 Feb 2012 22:54:58 +0000 (14:54 -0800)]
am
8f0f10a8: Merge "Experiment with seeking to closest frame instead of closest syncframe"
* commit '
8f0f10a80a89b2071b949f13ac6ff23514366d23':
Experiment with seeking to closest frame instead of closest syncframe
Andreas Huber [Thu, 9 Feb 2012 22:52:58 +0000 (14:52 -0800)]
Merge "Experiment with seeking to closest frame instead of closest syncframe"
Joe Fernandez [Thu, 9 Feb 2012 21:53:42 +0000 (13:53 -0800)]
am
f4aaf1f5: am
4f21e3a0: am
20b9c795: am
1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)" into ics-mr1
* commit '
f4aaf1f56247289838f4bb25ee704196464be4f2':
docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)
Joe Fernandez [Thu, 9 Feb 2012 21:51:00 +0000 (13:51 -0800)]
am
4f21e3a0: am
20b9c795: am
1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)" into ics-mr1
* commit '
4f21e3a08adefbb5e109e2f844386ed844c1c436':
docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)
Joe Fernandez [Thu, 9 Feb 2012 21:48:46 +0000 (13:48 -0800)]
am
20b9c795: am
1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)" into ics-mr1
* commit '
20b9c795d4dedaabac335eb5bcd8f7ba32e38af3':
docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)
Joe Fernandez [Thu, 9 Feb 2012 21:46:55 +0000 (13:46 -0800)]
am
1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)" into ics-mr1
* commit '
1c66faab73b2ce54bfe362f3c051ce95ed89fb22':
docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)
Joe Fernandez [Thu, 9 Feb 2012 21:46:41 +0000 (13:46 -0800)]
am
1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)" into ics-mr1
* commit '
1c66faab73b2ce54bfe362f3c051ce95ed89fb22':
docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)
Joe Fernandez [Thu, 9 Feb 2012 21:45:01 +0000 (13:45 -0800)]
Merge "docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)" into ics-mr1
Scott Main [Thu, 9 Feb 2012 20:55:36 +0000 (12:55 -0800)]
am
e7eeace5: am
ec12ae99: am
79cfde69: am
52bfc243: docs: fix misc doc bugs from external issue tracker
* commit '
e7eeace594861365b4b5de08eee2cb4c0abf06b2':
docs: fix misc doc bugs from external issue tracker
Scott Main [Thu, 9 Feb 2012 20:53:12 +0000 (12:53 -0800)]
am
ec12ae99: am
79cfde69: am
52bfc243: docs: fix misc doc bugs from external issue tracker
* commit '
ec12ae9933e463181338834387caa7c58b330635':
docs: fix misc doc bugs from external issue tracker
Scott Main [Thu, 9 Feb 2012 20:50:18 +0000 (12:50 -0800)]
am
79cfde69: am
52bfc243: docs: fix misc doc bugs from external issue tracker
* commit '
79cfde69fdd9952d51d4d9915c8b7fca98331e2c':
docs: fix misc doc bugs from external issue tracker
Scott Main [Thu, 9 Feb 2012 20:48:18 +0000 (12:48 -0800)]
am
52bfc243: docs: fix misc doc bugs from external issue tracker
* commit '
52bfc243684b2f340da326aaa38e9021e4e3b2e6':
docs: fix misc doc bugs from external issue tracker
Scott Main [Thu, 9 Feb 2012 20:48:08 +0000 (12:48 -0800)]
am
52bfc243: docs: fix misc doc bugs from external issue tracker
* commit '
52bfc243684b2f340da326aaa38e9021e4e3b2e6':
docs: fix misc doc bugs from external issue tracker
Eric Fischer [Thu, 9 Feb 2012 19:38:54 +0000 (11:38 -0800)]
am
48e1b91b: Merge "Import translations. DO NOT MERGE"
* commit '
48e1b91b36a47b39c2317a9fd595799dcf92b844':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 9 Feb 2012 19:37:18 +0000 (11:37 -0800)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Thu, 9 Feb 2012 19:28:38 +0000 (11:28 -0800)]
am
c725a370: Merge "Import translations. DO NOT MERGE"
* commit '
c725a3705ba8646e134091981e84da99fe4076b1':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 9 Feb 2012 19:26:02 +0000 (11:26 -0800)]
Merge "Import translations. DO NOT MERGE"
Dianne Hackborn [Thu, 9 Feb 2012 19:22:17 +0000 (11:22 -0800)]
am
7ff3144a: Merge "Add new feature for running services in "isolated" sandbox processes."
* commit '
7ff3144aa6a4c5e6f0f64933ce174b424cfbfd6e':
Add new feature for running services in "isolated" sandbox processes.
Dianne Hackborn [Thu, 9 Feb 2012 19:20:07 +0000 (11:20 -0800)]
Merge "Add new feature for running services in "isolated" sandbox processes."
Jamie Gennis [Thu, 9 Feb 2012 19:09:30 +0000 (11:09 -0800)]
am
1c90e73f: Merge "Refactored ISurfaceTexture calls from SurfaceTexture into BufferQueue."
* commit '
1c90e73f5d22c3d8e07b236ec8f33a42c01e056f':
Refactored ISurfaceTexture calls from SurfaceTexture into BufferQueue.
Jamie Gennis [Thu, 9 Feb 2012 19:08:02 +0000 (11:08 -0800)]
Merge "Refactored ISurfaceTexture calls from SurfaceTexture into BufferQueue."
Steve Block [Thu, 9 Feb 2012 11:29:24 +0000 (03:29 -0800)]
am
0777d2df: Merge "Clarify comments for WebSettings."
* commit '
0777d2df89e4c5269fce6054ee1a0446043ce112':
Clarify comments for WebSettings.
Steve Block [Thu, 9 Feb 2012 11:04:49 +0000 (03:04 -0800)]
Merge "Clarify comments for WebSettings."
OSDN Git Service
