OSDN Git Service
Marco Nelissen [Thu, 2 Feb 2012 18:50:11 +0000 (10:50 -0800)]
am
8ca8a69d: Merge "Enable media scanner bulk inserts"
* commit '
8ca8a69d5801ad4b809e7b9dbf53bd728820924b':
Enable media scanner bulk inserts
Marco Nelissen [Thu, 2 Feb 2012 18:48:01 +0000 (10:48 -0800)]
Merge "Enable media scanner bulk inserts"
Chet Haase [Thu, 2 Feb 2012 18:44:43 +0000 (10:44 -0800)]
am
659793bc: Merge "Add Developer Option setting for Animator scaling."
* commit '
659793bcd0e0d08306d841f3836a891e56e4e756':
Add Developer Option setting for Animator scaling.
Dianne Hackborn [Thu, 2 Feb 2012 18:44:40 +0000 (10:44 -0800)]
am
306eed22: Merge "Use Choreographer for window manager animation timing."
* commit '
306eed22e58381bbd694e3a297adc2313cc50c85':
Use Choreographer for window manager animation timing.
Chet Haase [Thu, 2 Feb 2012 18:42:44 +0000 (10:42 -0800)]
Merge "Add Developer Option setting for Animator scaling."
Dianne Hackborn [Thu, 2 Feb 2012 18:41:50 +0000 (10:41 -0800)]
Merge "Use Choreographer for window manager animation timing."
Scott Main [Thu, 2 Feb 2012 18:05:46 +0000 (10:05 -0800)]
am
14e655f9: am
1e148f50: am
2adfc9de: am
633de7ba: docs: fix meta description tag for homepage
* commit '
14e655f93f76ceb7e933aac4c1a1049ea6ac1e1c':
Scott Main [Thu, 2 Feb 2012 18:05:44 +0000 (10:05 -0800)]
Scott Main [Thu, 2 Feb 2012 18:05:41 +0000 (10:05 -0800)]
am
4e921c55: am
4e133702: am
be09298e: am
633de7ba: docs: fix meta description tag for homepage
* commit '
4e921c554eed96dc4b87003e2021c7cc53d65a66':
docs: fix meta description tag for homepage
Scott Main [Thu, 2 Feb 2012 18:03:43 +0000 (10:03 -0800)]
am
1e148f50: am
2adfc9de: am
633de7ba: docs: fix meta description tag for homepage
* commit '
1e148f509eda581b8ef7cf77acad7f9216034891':
Scott Main [Thu, 2 Feb 2012 18:03:42 +0000 (10:03 -0800)]
Scott Main [Thu, 2 Feb 2012 18:03:25 +0000 (10:03 -0800)]
am
4e133702: am
be09298e: am
633de7ba: docs: fix meta description tag for homepage
* commit '
4e133702acc81ac72a23aa9784c05deec5be59b6':
docs: fix meta description tag for homepage
Eric Laurent [Thu, 2 Feb 2012 17:42:34 +0000 (09:42 -0800)]
am
175df115: Merge "modifications for new webrtc modules"
* commit '
175df1156154dcb889eb36c446cabed351e873db':
modifications for new webrtc modules
Eric Laurent [Thu, 2 Feb 2012 17:39:28 +0000 (09:39 -0800)]
Merge "modifications for new webrtc modules"
Alex Sakhartchouk [Thu, 2 Feb 2012 17:15:11 +0000 (09:15 -0800)]
Merge "Cleanup." into graphics-dev
James Dong [Thu, 2 Feb 2012 02:56:03 +0000 (18:56 -0800)]
am
26daa02b: Merge "Remove the restriction that the width must be a multiple of 4 or 2 for thumbnail generation"
* commit '
26daa02bdb0c62f8162ad8d4d771cabce8644b4a':
Remove the restriction that the width must be a multiple of 4 or 2 for thumbnail generation
James Dong [Thu, 2 Feb 2012 02:53:50 +0000 (18:53 -0800)]
Merge "Remove the restriction that the width must be a multiple of 4 or 2 for thumbnail generation"
Svetoslav Ganov [Thu, 2 Feb 2012 02:09:48 +0000 (18:09 -0800)]
am
4e921197: Merge "Update the comment for View#clearFocus"
* commit '
4e921197e26b64a6fdc0ab896922b72d8565b427':
Update the comment for View#clearFocus
Svetoslav Ganov [Thu, 2 Feb 2012 02:08:01 +0000 (18:08 -0800)]
Merge "Update the comment for View#clearFocus"
Adam Powell [Thu, 2 Feb 2012 01:48:48 +0000 (17:48 -0800)]
am
80ec4ab7: Merge "Fix bug
5339708 - edge case in ListView focus restoration"
* commit '
80ec4ab7f56646e464dbe6ff123703a178401b90':
Fix bug
5339708 - edge case in ListView focus restoration
Adam Powell [Thu, 2 Feb 2012 01:46:55 +0000 (17:46 -0800)]
Merge "Fix bug
5339708 - edge case in ListView focus restoration"
Fabrice Di Meglio [Thu, 2 Feb 2012 01:24:10 +0000 (17:24 -0800)]
am
81453f76: Merge "Fix bug #
5262565 Need to remove CharCount TextDirectionHeuristics"
* commit '
81453f761a21c4d76dfd2f81c8651eab3217b3df':
Fix bug #
5262565 Need to remove CharCount TextDirectionHeuristics
Fabrice Di Meglio [Thu, 2 Feb 2012 01:21:59 +0000 (17:21 -0800)]
Merge "Fix bug #
5262565 Need to remove CharCount TextDirectionHeuristics"
Stephen Hines [Thu, 2 Feb 2012 01:11:44 +0000 (17:11 -0800)]
am
bb3968fe: Merge "Remove wrapper version check assert."
* commit '
bb3968fed8e7fb2b53ac32d40e26e0d21600a922':
Remove wrapper version check assert.
Stephen Hines [Thu, 2 Feb 2012 01:09:12 +0000 (17:09 -0800)]
Merge "Remove wrapper version check assert."
Jeff Sharkey [Thu, 2 Feb 2012 00:56:57 +0000 (16:56 -0800)]
am
88de70f3: Merge "Deprecate ACTION_BACKGROUND_DATA_SETTING_CHANGED."
* commit '
88de70f3c5824acae7524a774f9d2e2a6d125eb9':
Deprecate ACTION_BACKGROUND_DATA_SETTING_CHANGED.
Jeff Sharkey [Thu, 2 Feb 2012 00:54:53 +0000 (16:54 -0800)]
Merge "Deprecate ACTION_BACKGROUND_DATA_SETTING_CHANGED."
Jeff Brown [Thu, 2 Feb 2012 00:33:11 +0000 (16:33 -0800)]
am
9dbfc331: Merge "Support automatic cancellation of Loaders."
* commit '
9dbfc331b42371c5bcb1d8ec7750f4cd4f914123':
Support automatic cancellation of Loaders.
Jeff Brown [Thu, 2 Feb 2012 00:31:48 +0000 (16:31 -0800)]
Merge "Support automatic cancellation of Loaders."
Romain Guy [Thu, 2 Feb 2012 00:17:23 +0000 (16:17 -0800)]
am
bbf1bc8b: Merge "Add optional metadata to initiliaze the render threat."
* commit '
bbf1bc8b6c3348265930ce08506efbbd3c5ab61f':
Add optional metadata to initiliaze the render threat.
Romain Guy [Thu, 2 Feb 2012 00:15:17 +0000 (16:15 -0800)]
Merge "Add optional metadata to initiliaze the render threat."
Scott Main [Wed, 1 Feb 2012 23:56:56 +0000 (15:56 -0800)]
am
2adfc9de: am
633de7ba: docs: fix meta description tag for homepage
* commit '
2adfc9de0390962701535d0c075c4fb8e886d9d8':
Scott Main [Wed, 1 Feb 2012 23:56:55 +0000 (15:56 -0800)]
Scott Main [Wed, 1 Feb 2012 23:15:10 +0000 (15:15 -0800)]
am
be09298e: am
633de7ba: docs: fix meta description tag for homepage
* commit '
be09298eb708f6acb6af7028fbca28afdf230008':
docs: fix meta description tag for homepage
Scott Main [Wed, 1 Feb 2012 23:12:40 +0000 (15:12 -0800)]
am
633de7ba: docs: fix meta description tag for homepage
* commit '
633de7bab9397c4f7591c5514d903305254451b2':
docs: fix meta description tag for homepage
Scott Main [Wed, 1 Feb 2012 23:12:33 +0000 (15:12 -0800)]
am
633de7ba: docs: fix meta description tag for homepage
* commit '
633de7bab9397c4f7591c5514d903305254451b2':
docs: fix meta description tag for homepage
Chet Haase [Wed, 1 Feb 2012 23:10:30 +0000 (15:10 -0800)]
am
6baed6c1: Merge "Add Developer Option setting for Animator scaling."
* commit '
6baed6c11090fe6eb0a612ca4acee590e904ca58':
Add Developer Option setting for Animator scaling.
Chet Haase [Wed, 1 Feb 2012 23:08:26 +0000 (15:08 -0800)]
Merge "Add Developer Option setting for Animator scaling."
Scott Main [Wed, 1 Feb 2012 23:07:44 +0000 (15:07 -0800)]
am
1dcd36a8: am
931d1daf: am
fb16fdf2: am
6aaa27fb: docs: fix broken link
* commit '
1dcd36a8add2424b144b423424c64d931f61b3e4':
docs: fix broken link
Scott Main [Wed, 1 Feb 2012 23:05:41 +0000 (15:05 -0800)]
am
931d1daf: am
fb16fdf2: am
6aaa27fb: docs: fix broken link
* commit '
931d1daf1a0b0d61adf1a4c380a7ad00b8ead526':
docs: fix broken link
John Reck [Wed, 1 Feb 2012 23:05:20 +0000 (15:05 -0800)]
John Reck [Wed, 1 Feb 2012 23:03:38 +0000 (15:03 -0800)]
Merge "Fix NPE"
Scott Main [Wed, 1 Feb 2012 23:03:15 +0000 (15:03 -0800)]
am
fb16fdf2: am
6aaa27fb: docs: fix broken link
* commit '
fb16fdf2d11b807e9c5d986e6135c2915f1f6523':
docs: fix broken link
Scott Main [Wed, 1 Feb 2012 23:00:49 +0000 (15:00 -0800)]
am
6aaa27fb: docs: fix broken link
* commit '
6aaa27fb8c4ba500a9b486c2baba5b01bcc34bf2':
docs: fix broken link
Scott Main [Wed, 1 Feb 2012 23:00:30 +0000 (15:00 -0800)]
am
6aaa27fb: docs: fix broken link
* commit '
6aaa27fb8c4ba500a9b486c2baba5b01bcc34bf2':
docs: fix broken link
Wink Saville [Wed, 1 Feb 2012 22:50:41 +0000 (14:50 -0800)]
am
064d2d65: Merge "Telephony: Fix sim_refresh as per ril v6"
* commit '
064d2d65697ecd95c72e2724cf066f8ad162d240':
Telephony: Fix sim_refresh as per ril v6
Wink Saville [Wed, 1 Feb 2012 22:48:14 +0000 (14:48 -0800)]
Merge "Telephony: Fix sim_refresh as per ril v6"
Christopher Tate [Wed, 1 Feb 2012 22:39:57 +0000 (14:39 -0800)]
am
f46723b4: Implement background vs foreground broadcasts
* commit '
f46723b41f723ebfc9ed18c7c409b319f4b5e539':
Implement background vs foreground broadcasts
Alex Sakhartchouk [Wed, 1 Feb 2012 22:30:36 +0000 (14:30 -0800)]
Merge "Making sure that parameter updates are properly propagated to RS. Cleanup of param creation code." into graphics-dev
Stephen Hines [Wed, 1 Feb 2012 22:04:56 +0000 (14:04 -0800)]
am
c97992b4: Merge "Add test for "public final static"-reflected constant fields."
* commit '
c97992b489161a47f156f03ba605273dfb5e5cc2':
Add test for "public final static"-reflected constant fields.
Scott Main [Wed, 1 Feb 2012 22:02:28 +0000 (14:02 -0800)]
am
ff35de85: am
4f7f2b8b: am
b49c0355: am
6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1
* commit '
ff35de850caef70105ddb82becea4cab74ad21b2':
Scott Main [Wed, 1 Feb 2012 22:02:26 +0000 (14:02 -0800)]
am
e04a2fbc: am
3a080357: am
e043db89: am
f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1
* commit '
e04a2fbca82c1ff3e5937f63a19764e33ff0c059':
Stephen Hines [Wed, 1 Feb 2012 22:01:35 +0000 (14:01 -0800)]
Merge "Add test for "public final static"-reflected constant fields."
Scott Main [Wed, 1 Feb 2012 21:59:23 +0000 (13:59 -0800)]
am
57b5b309: am
eea2e9c1: am
13f3c854: am
5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions
* commit '
57b5b30981fdd17a7cd37749bb27827052831197':
Xia Wang [Wed, 1 Feb 2012 21:59:21 +0000 (13:59 -0800)]
am
bba103c6: am
c8c9ebe8: am
581a3334: am
ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1
* commit '
bba103c6d54ae6db1e756cabb1afbbc9b98972d9':
Scott Main [Wed, 1 Feb 2012 21:59:20 +0000 (13:59 -0800)]
am
4f7f2b8b: am
b49c0355: am
6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1
* commit '
4f7f2b8bc3e1e6fb86ef1ccc0897e20c6cac8d48':
Scott Main [Wed, 1 Feb 2012 21:59:19 +0000 (13:59 -0800)]
am
3a080357: am
e043db89: am
f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1
* commit '
3a08035788fe897ad21d53c76c063e9e902750df':
Scott Main [Wed, 1 Feb 2012 21:56:50 +0000 (13:56 -0800)]
am
eea2e9c1: am
13f3c854: am
5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions
* commit '
eea2e9c1344dfa30d350a54d4fef69069c6941a9':
Xia Wang [Wed, 1 Feb 2012 21:56:49 +0000 (13:56 -0800)]
am
c8c9ebe8: am
581a3334: am
ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1
* commit '
c8c9ebe868bb16f1b564b95243c0d5fd1d09ad6f':
Scott Main [Wed, 1 Feb 2012 21:54:48 +0000 (13:54 -0800)]
am
b49c0355: am
6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1
* commit '
b49c0355aa6cb7411f6f5061f5fd31ee5cdea14d':
Scott Main [Wed, 1 Feb 2012 21:54:45 +0000 (13:54 -0800)]
am
e043db89: am
f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1
* commit '
e043db892436f643fc2d71df3bc4b2604c556988':
Scott Main [Wed, 1 Feb 2012 21:54:43 +0000 (13:54 -0800)]
am
13f3c854: am
5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions
* commit '
13f3c854d8fb635fa824a1ba15fe85152fed131e':
Xia Wang [Wed, 1 Feb 2012 21:54:40 +0000 (13:54 -0800)]
am
581a3334: am
ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1
* commit '
581a33344485181eb3484ba7bf50ff2b52be6d99':
Scott Main [Wed, 1 Feb 2012 21:52:21 +0000 (13:52 -0800)]
am
6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1
* commit '
6b3f98b458b9dc7771cce37221d4fe8c4a19bf05':
docs: fix action bar style example
Scott Main [Wed, 1 Feb 2012 21:52:19 +0000 (13:52 -0800)]
am
f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1
* commit '
f47f6791f897b436530557dea3a57a2ca969afe6':
docs: dashboard update for feb 1
Scott Main [Wed, 1 Feb 2012 21:52:17 +0000 (13:52 -0800)]
am
5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions
* commit '
5e0959393426371dadef2c7905d5c915a1ac2dd4':
docs: update menu guide with CAB and popup menu, plus many other revisions
Xia Wang [Wed, 1 Feb 2012 21:52:13 +0000 (13:52 -0800)]
am
ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1
* commit '
ccc11c4d3c8357a402b84c546e7b2f889729358c':
Fix a typo in image processing test
Svetoslav Ganov [Wed, 1 Feb 2012 21:48:36 +0000 (13:48 -0800)]
am
2eecea3b: Merge "Speedup the accessibility window querying APIs and clean up."
* commit '
2eecea3b48ece6f45b30fef9b41dc20075ccc94f':
Speedup the accessibility window querying APIs and clean up.
Svetoslav Ganov [Wed, 1 Feb 2012 21:45:24 +0000 (13:45 -0800)]
Merge "Speedup the accessibility window querying APIs and clean up."
Andreas Huber [Wed, 1 Feb 2012 21:28:21 +0000 (13:28 -0800)]
am
c5143d2a: Merge "The AMR WB software encoder is now an OMX component."
* commit '
c5143d2af8babe3585b6a41b121ab15ef093355f':
The AMR WB software encoder is now an OMX component.
Andreas Huber [Wed, 1 Feb 2012 21:25:26 +0000 (13:25 -0800)]
Merge "The AMR WB software encoder is now an OMX component."
Siva Velusamy [Wed, 1 Feb 2012 21:10:47 +0000 (13:10 -0800)]
am
295ac065: Merge "gltrace: fixup Push & Insert Marker calls"
* commit '
295ac06562c2166767853af5bbc94fa7b7ea56cb':
gltrace: fixup Push & Insert Marker calls
Siva Velusamy [Wed, 1 Feb 2012 21:08:58 +0000 (13:08 -0800)]
Merge "gltrace: fixup Push & Insert Marker calls"
Siva Velusamy [Wed, 1 Feb 2012 20:16:40 +0000 (12:16 -0800)]
gltrace: fixup Push & Insert Marker calls
Change-Id: I58ced7225fac79ec636a65da4883614a5dce6dff
Scott Main [Wed, 1 Feb 2012 20:03:31 +0000 (12:03 -0800)]
am
b8f2c351: am
d3747509: am
8f6b4c52: am
6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1
* commit '
b8f2c3514e2f30247d5a4e0e38c825ec0a0ced6f':
docs: fix action bar style example
Scott Main [Wed, 1 Feb 2012 20:01:32 +0000 (12:01 -0800)]
am
d3747509: am
8f6b4c52: am
6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1
* commit '
d3747509f5d3c64f1fbc6255a6f7f20aac023ead':
docs: fix action bar style example
Scott Main [Wed, 1 Feb 2012 19:58:57 +0000 (11:58 -0800)]
am
8f6b4c52: am
6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1
* commit '
8f6b4c52ded03527d3c60e99cafa66aaabb4f355':
docs: fix action bar style example
Scott Main [Wed, 1 Feb 2012 19:56:23 +0000 (11:56 -0800)]
am
6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1
* commit '
6b3f98b458b9dc7771cce37221d4fe8c4a19bf05':
docs: fix action bar style example
Scott Main [Wed, 1 Feb 2012 19:54:57 +0000 (11:54 -0800)]
Merge "docs: fix action bar style example" into ics-mr1
Scott Main [Wed, 1 Feb 2012 19:54:53 +0000 (11:54 -0800)]
am
fcaf0ff7: am
0683d096: am
b43a0f1f: am
f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1
* commit '
fcaf0ff7be23df9f70dee014472292241c93c4e0':
docs: dashboard update for feb 1
Scott Main [Wed, 1 Feb 2012 19:54:49 +0000 (11:54 -0800)]
am
0f4dc8f7: am
414cc6cf: am
9af875ec: am
5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions
* commit '
0f4dc8f7d762f3ceab91e7b3a24bcb88989c7190':
docs: update menu guide with CAB and popup menu, plus many other revisions
Scott Main [Wed, 1 Feb 2012 19:51:56 +0000 (11:51 -0800)]
am
0683d096: am
b43a0f1f: am
f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1
* commit '
0683d0963b95f7c19318e7bfc74fc887332057e4':
docs: dashboard update for feb 1
Scott Main [Wed, 1 Feb 2012 19:51:53 +0000 (11:51 -0800)]
am
414cc6cf: am
9af875ec: am
5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions
* commit '
414cc6cfcdb6d766d095f0af1da76e7da946af84':
docs: update menu guide with CAB and popup menu, plus many other revisions
Scott Main [Wed, 1 Feb 2012 19:48:28 +0000 (11:48 -0800)]
am
b43a0f1f: am
f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1
* commit '
b43a0f1fe5cddf1376c52d0ace2d958f21e4044d':
docs: dashboard update for feb 1
Scott Main [Wed, 1 Feb 2012 19:48:26 +0000 (11:48 -0800)]
am
9af875ec: am
5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions
* commit '
9af875ec74e34541539897d7a8069b4ea7f07b12':
docs: update menu guide with CAB and popup menu, plus many other revisions
Scott Main [Wed, 1 Feb 2012 19:45:51 +0000 (11:45 -0800)]
am
f47f6791: Merge "docs: dashboard update for feb 1" into ics-mr1
* commit '
f47f6791f897b436530557dea3a57a2ca969afe6':
docs: dashboard update for feb 1
Scott Main [Wed, 1 Feb 2012 19:45:49 +0000 (11:45 -0800)]
am
5e095939: docs: update menu guide with CAB and popup menu, plus many other revisions
* commit '
5e0959393426371dadef2c7905d5c915a1ac2dd4':
docs: update menu guide with CAB and popup menu, plus many other revisions
Andreas Huber [Wed, 1 Feb 2012 19:45:17 +0000 (11:45 -0800)]
am
d528f036: Merge "The software AMR NB encoder is now an OMX component."
* commit '
d528f036d1185efff49e0a576084e711d2f550d8':
The software AMR NB encoder is now an OMX component.
Scott Main [Wed, 1 Feb 2012 19:43:48 +0000 (11:43 -0800)]
Merge "docs: dashboard update for feb 1" into ics-mr1
Alex Sakhartchouk [Wed, 1 Feb 2012 19:33:13 +0000 (11:33 -0800)]
Merge "Optimize camera updates from java. Remove duplicate constants." into graphics-dev
Andreas Huber [Wed, 1 Feb 2012 19:31:13 +0000 (11:31 -0800)]
Merge "The software AMR NB encoder is now an OMX component."
Xia Wang [Wed, 1 Feb 2012 19:14:01 +0000 (11:14 -0800)]
am
a8c0d5e6: Merge "Use PackageManager to detect wifi-only devices in ConnectivityManagerTest."
* commit '
a8c0d5e6d4a83da42dc318fe61ac38a519043b99':
Use PackageManager to detect wifi-only devices in ConnectivityManagerTest.
Xia Wang [Wed, 1 Feb 2012 19:12:05 +0000 (11:12 -0800)]
Merge "Use PackageManager to detect wifi-only devices in ConnectivityManagerTest."
Xia Wang [Wed, 1 Feb 2012 19:03:00 +0000 (11:03 -0800)]
am
6b110728: am
606b16bc: am
e546b879: am
ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1
* commit '
6b11072884e5b73794948a2dd03cb9503bdbba74':
Fix a typo in image processing test
Xia Wang [Wed, 1 Feb 2012 18:59:44 +0000 (10:59 -0800)]
am
606b16bc: am
e546b879: am
ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1
* commit '
606b16bc160e66709408b3e49e273efcff0a148d':
Fix a typo in image processing test
Xia Wang [Wed, 1 Feb 2012 18:57:07 +0000 (10:57 -0800)]
am
e546b879: am
ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1
* commit '
e546b879a5aa9c58a58fc1c5a2e3eb0123d4d5b2':
Fix a typo in image processing test
Xia Wang [Wed, 1 Feb 2012 18:54:30 +0000 (10:54 -0800)]
am
ccc11c4d: Merge "Fix a typo in image processing test" into ics-mr1
* commit '
ccc11c4d3c8357a402b84c546e7b2f889729358c':
Fix a typo in image processing test
Xia Wang [Wed, 1 Feb 2012 18:51:43 +0000 (10:51 -0800)]
Merge "Fix a typo in image processing test" into ics-mr1
Makoto Onuki [Wed, 1 Feb 2012 18:46:27 +0000 (10:46 -0800)]
am
8781fd99: Merge "Fix 3 broken unittests."
* commit '
8781fd9908e467d3564d47f2cfbae384ca49fb0c':
Fix 3 broken unittests.
Makoto Onuki [Wed, 1 Feb 2012 18:44:10 +0000 (10:44 -0800)]
Merge "Fix 3 broken unittests."
OSDN Git Service
