Jeff Brown
|
504f982fd3
|
Use libcorkscrew to format the stack trace.
Change-Id: I3a5439ada76bc77c2dd491eaed2272e16a811cc7
|
2011-11-21 21:04:55 -08:00 |
|
Kristian Monsen
|
9c9793dd6e
|
am 376e93fc: am 7859c184: Merge "Improving PictureListener deprecating comments" into ics-mr1
* commit '376e93fcea19cd491af59631f3934ab036e1e846':
Improving PictureListener deprecating comments
|
2011-11-20 07:31:41 -08:00 |
|
Kristian Monsen
|
2fa8f3f966
|
am 7859c184: Merge "Improving PictureListener deprecating comments" into ics-mr1
* commit '7859c1842c1f2e3c43415dfb5337a0b005bdb1c4':
Improving PictureListener deprecating comments
|
2011-11-20 07:29:09 -08:00 |
|
Kristian Monsen
|
2f399ff6ef
|
Merge "Improving PictureListener deprecating comments" into ics-mr1
|
2011-11-20 07:26:59 -08:00 |
|
Daniel Sandler
|
38c0f6968b
|
am 25a43ada: am 9b5d7a59: Merge "Dreams (now Screen Candy) development." into ics-mr1
* commit '25a43adabb70aa769a097c6cb09d71b031431677':
Dreams (now Screen Candy) development.
|
2011-11-19 20:48:21 -08:00 |
|
Daniel Sandler
|
c05ee94e5f
|
am 9b5d7a59: Merge "Dreams (now Screen Candy) development." into ics-mr1
* commit '9b5d7a59f336a96e73f5f485f6e366e078a70497':
Dreams (now Screen Candy) development.
|
2011-11-19 20:44:40 -08:00 |
|
Daniel Sandler
|
faed2acf61
|
Merge "Dreams (now Screen Candy) development." into ics-mr1
|
2011-11-19 20:42:19 -08:00 |
|
Jesse Wilson
|
5a0837cb14
|
Merge "Fix the backups example to use a simpler lock."
|
2011-11-19 09:09:58 -08:00 |
|
Fabrice Di Meglio
|
8f8969834c
|
Merge "Fix TextLayoutCache Skia Typeface caching"
|
2011-11-18 16:32:43 -08:00 |
|
The Android Open Source Project
|
ec7f73e0cf
|
am 73b02758: am 0e2c2f39: Reconcile with ics-mr0-release
* commit '73b02758485b8a938318c608fcf828f660cced0d':
|
2011-11-18 15:56:59 -08:00 |
|
The Android Open Source Project
|
cd7f56fdd2
|
am 0e2c2f39: Reconcile with ics-mr0-release
* commit '0e2c2f3971eb4b246a5c1b198370e003668f53ee':
|
2011-11-18 15:53:25 -08:00 |
|
The Android Open Source Project
|
e1b2b00d75
|
Reconcile with ics-mr0-release
Change-Id: I61ef83c288814c62369fabdcf50d867708f05f51
|
2011-11-18 15:49:39 -08:00 |
|
The Android Open Source Project
|
e2b94cd392
|
Reconcile with ics-mr0-release ics-mr1-release
Change-Id: I31643242d240b4d1efef685583ec21934a88cc02
|
2011-11-18 15:42:32 -08:00 |
|
The Android Automerger
|
14d47ba602
|
merge in ics-mr0-release history after reset to ics-mr0
|
2011-11-18 15:37:45 -08:00 |
|
Marco Nelissen
|
b3b9697c43
|
am a1cd09e0: am 7ff7821a: am d4b22ab4: status_t != bool
* commit 'a1cd09e0e6a239eafa5112c0e8a09b7efc154a78':
status_t != bool
|
2011-11-18 15:35:00 -08:00 |
|
Svetoslav Ganov
|
437605bca8
|
am bdc2912d: am d8a3cabc: Merge "Text selection AccessibilityEvents are missing text." into ics-mr1
* commit 'bdc2912da64e5e6402c73997d637224d905ae825':
Text selection AccessibilityEvents are missing text.
|
2011-11-18 15:23:19 -08:00 |
|
Wei Huang
|
1f32546f79
|
am bcedde3c: am c2fff5ea: Merge "Unlock camera AWB lock only when white-balance is changed." into ics-mr1
* commit 'bcedde3cd614e2a241f4c4dad626b840fd9c2424':
Unlock camera AWB lock only when white-balance is changed.
|
2011-11-18 15:23:17 -08:00 |
|
The Android Open Source Project
|
05d78b0cd3
|
am 45b27a43: am d5280e51: Reconcile with ics-mr0-release
* commit '45b27a438cb23de8b4facda67d8ea6804f93f62c':
|
2011-11-18 15:23:01 -08:00 |
|
Mathias Agopian
|
8bee68fac2
|
am d0df44b5: am 4d71053b: Merge "attempt to fix bug 5313580" into ics-mr1
* commit 'd0df44b5c979e00a19187cea35768ba26557e447':
attempt to fix bug 5313580
|
2011-11-18 15:22:59 -08:00 |
|
Bart Sears
|
fc725ff099
|
am cb513ba7: am e6a96560: Merge "Content and viewport rects set in one step." into ics-mr1
* commit 'cb513ba7f14fdf08b5729edef5baf22e302e3e08':
Content and viewport rects set in one step.
|
2011-11-18 15:22:57 -08:00 |
|
Svetoslav Ganov
|
8482d373e1
|
am 322f884d: am 0358787f: Merge "Add the support libraries to the platform documentation (build)." into ics-mr1
* commit '322f884dfda201f7bcb5b8cbff80d0ae5122ced3':
Add the support libraries to the platform documentation (build).
|
2011-11-18 15:22:37 -08:00 |
|
Joe Fernandez
|
868abb25ec
|
am 0c778cdd: am dea90a0e: am 366113fa: Merge "docs: Camera Features for developers" into ics-mr0
* commit '0c778cdd9cfdb8007b15eef2eca91f3089590f98':
docs: Camera Features for developers
|
2011-11-18 15:22:31 -08:00 |
|
Marco Nelissen
|
ddd2a1feb8
|
am 7ff7821a: am d4b22ab4: status_t != bool
* commit '7ff7821a601a39fffb318e29873957b4a3703c46':
status_t != bool
|
2011-11-18 15:10:54 -08:00 |
|
Marco Nelissen
|
35ab318b31
|
am d4b22ab4: status_t != bool
* commit 'd4b22ab4889f9b1885bfc0dc45667c846a171a98':
status_t != bool
|
2011-11-18 15:07:21 -08:00 |
|
Scott Main
|
823388d161
|
am e17a4a02: am d353df8d: am 48eaa6c9: docs: update caption for action bar figure to match new screenshot
* commit 'e17a4a02617dbefbc870df8280ffa1cd82fff2a0':
docs: update caption for action bar figure to match new screenshot
|
2011-11-18 15:06:31 -08:00 |
|
Daniel Sandler
|
1ab29ba0ef
|
am 2e56995e: am da0e7b0c: Merge "Tie screen saver to the screen off timeout." into ics-mr1
* commit '2e56995e9e19f18958167a28911120f31b096756':
Tie screen saver to the screen off timeout.
|
2011-11-18 14:47:58 -08:00 |
|
Adam Powell
|
2589402333
|
am 65035d2a: am 8c54182f: Merge "Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)" into ics-mr1
* commit '65035d2a72fd8c847aa9c78c0e97058535ec18a5':
Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)
|
2011-11-18 14:47:55 -08:00 |
|
Jim Miller
|
edc350504e
|
Merge "resolved conflicts for merge of 1a783be3 to master"
|
2011-11-18 14:44:50 -08:00 |
|
Svetoslav Ganov
|
23a76d9a8d
|
am d8a3cabc: Merge "Text selection AccessibilityEvents are missing text." into ics-mr1
* commit 'd8a3cabcb11c02c54b76590e0f60c32b43b9f2fc':
Text selection AccessibilityEvents are missing text.
|
2011-11-18 14:41:29 -08:00 |
|
Svetoslav Ganov
|
c47b855401
|
Merge "Text selection AccessibilityEvents are missing text." into ics-mr1
|
2011-11-18 14:39:05 -08:00 |
|
Wei Huang
|
8faf46afe3
|
am c2fff5ea: Merge "Unlock camera AWB lock only when white-balance is changed." into ics-mr1
* commit 'c2fff5ea39027d017dc15ce285961afa17a7b4a7':
Unlock camera AWB lock only when white-balance is changed.
|
2011-11-18 14:02:44 -08:00 |
|
Daisuke Miyakawa
|
8c025caa57
|
Merge "Introduce Callable URI as hidden API"
|
2011-11-18 14:02:28 -08:00 |
|
Wei Huang
|
45773c0574
|
Merge "Unlock camera AWB lock only when white-balance is changed." into ics-mr1
|
2011-11-18 14:00:09 -08:00 |
|
Jeff Sharkey
|
0e52d229c2
|
Merge "Clean up NMS AIDL and permissions checking."
|
2011-11-18 13:57:59 -08:00 |
|
Jim Miller
|
19a87be79e
|
resolved conflicts for merge of 1a783be3 to master
Change-Id: Ibaff3547ac51250fe40adf3aa06d6a30ecfcef54
|
2011-11-18 13:56:20 -08:00 |
|
Marco Nelissen
|
2bf09c353a
|
Merge "status_t != bool"
|
2011-11-18 13:52:35 -08:00 |
|
The Android Open Source Project
|
17ddb89806
|
am d5280e51: Reconcile with ics-mr0-release
* commit 'd5280e51aa4578ff47bffc166f74d79c17358589':
|
2011-11-18 13:35:32 -08:00 |
|
Mathias Agopian
|
c4dd3a44c6
|
am 4d71053b: Merge "attempt to fix bug 5313580" into ics-mr1
* commit '4d71053b0728b248d80d7d5a098df459722e2be0':
attempt to fix bug 5313580
|
2011-11-18 13:35:23 -08:00 |
|
Bart Sears
|
708e9b4be5
|
am e6a96560: Merge "Content and viewport rects set in one step." into ics-mr1
* commit 'e6a96560ed96e5121db2e22168698f14338c8f1d':
Content and viewport rects set in one step.
|
2011-11-18 13:35:14 -08:00 |
|
The Android Open Source Project
|
3540b77da3
|
Reconcile with ics-mr0-release
Change-Id: I805d2b484b72fb640a889ff2a4b67944cbbe012a
|
2011-11-18 13:12:33 -08:00 |
|
Mathias Agopian
|
6285c6cf10
|
Merge "attempt to fix bug 5313580" into ics-mr1
|
2011-11-18 12:11:15 -08:00 |
|
Jesse Wilson
|
c05413fd47
|
Merge "Remove untrue tip about zero-length arrays."
|
2011-11-18 12:06:42 -08:00 |
|
Bart Sears
|
3b244a74e1
|
Merge "Content and viewport rects set in one step." into ics-mr1
|
2011-11-18 11:46:26 -08:00 |
|
Svetoslav Ganov
|
3758a56f37
|
am 0358787f: Merge "Add the support libraries to the platform documentation (build)." into ics-mr1
* commit '0358787f68c48fb10f2d8067fd53f0471481320a':
Add the support libraries to the platform documentation (build).
|
2011-11-18 10:14:04 -08:00 |
|
Svetoslav Ganov
|
fc48e6b29e
|
Merge "Add the support libraries to the platform documentation (build)." into ics-mr1
|
2011-11-18 10:11:35 -08:00 |
|
Guang Zhu
|
eefa17eef7
|
am 1753fd00: am 3af8b699: Merge "add a self instrumentation into framework perf app" into ics-mr1
* commit '1753fd00764614213cfb9f88b00ee16fe3c1da3e':
add a self instrumentation into framework perf app
|
2011-11-18 09:15:56 -08:00 |
|
satok
|
3efe34d52b
|
am 852b589a: am 1a3c051b: Merge "Hide/show ime switch icon properly" into ics-mr1
* commit '852b589a51531f8f7a166f36f7596c255896f35c':
Hide/show ime switch icon properly
|
2011-11-18 09:15:54 -08:00 |
|
Joe Fernandez
|
7ca2a20463
|
am dea90a0e: am 366113fa: Merge "docs: Camera Features for developers" into ics-mr0
* commit 'dea90a0e1c9c1d15657024893b6793dc21bc27ef':
docs: Camera Features for developers
|
2011-11-18 06:17:59 -08:00 |
|
Joe Fernandez
|
eb79157376
|
am 366113fa: Merge "docs: Camera Features for developers" into ics-mr0
* commit '366113fa1bea5ef39cf6557f18ff00310eb6e458':
docs: Camera Features for developers
|
2011-11-18 06:14:01 -08:00 |
|
Scott Main
|
df349c6d69
|
am d353df8d: am 48eaa6c9: docs: update caption for action bar figure to match new screenshot
* commit 'd353df8db4f51868e1e09463b2c25e3637ad8e95':
docs: update caption for action bar figure to match new screenshot
|
2011-11-18 02:53:00 -08:00 |
|