OSDN Git Service
Scott Main [Wed, 11 Apr 2012 18:41:27 +0000 (11:41 -0700)]
am
047b8f3c: am
06874425: am
71e8f4c1: Merge "docs: add 101 class about intents, Interacting with Other Apps" into ics-mr1
* commit '
047b8f3ccc280914defc35049d029d5b92a07269':
docs: add 101 class about intents, Interacting with Other Apps
Scott Main [Wed, 11 Apr 2012 18:38:21 +0000 (11:38 -0700)]
am
06874425: am
71e8f4c1: Merge "docs: add 101 class about intents, Interacting with Other Apps" into ics-mr1
* commit '
068744258bce3fa5f47aa40f591793bbfa006613':
docs: add 101 class about intents, Interacting with Other Apps
Scott Main [Wed, 11 Apr 2012 18:34:29 +0000 (11:34 -0700)]
am
71e8f4c1: Merge "docs: add 101 class about intents, Interacting with Other Apps" into ics-mr1
* commit '
71e8f4c152a84ff420dcf834bc0acd73644f0cb0':
docs: add 101 class about intents, Interacting with Other Apps
Scott Main [Wed, 11 Apr 2012 18:32:40 +0000 (11:32 -0700)]
Merge "docs: add 101 class about intents, Interacting with Other Apps" into ics-mr1
Jeff Brown [Wed, 11 Apr 2012 17:52:17 +0000 (10:52 -0700)]
Merge "Be more careful about exceptions in input callbacks."
Amith Yamasani [Wed, 11 Apr 2012 17:24:20 +0000 (10:24 -0700)]
Merge "Bind to the correct face lock service."
Craig Mautner [Wed, 11 Apr 2012 16:35:05 +0000 (09:35 -0700)]
Merge "Check for existing dimming before stop dimming."
Craig Mautner [Wed, 11 Apr 2012 16:25:53 +0000 (09:25 -0700)]
Check for existing dimming before stop dimming.
Add a test to make sure that we are dimming before we send the message
to stop it. This prevents a CPU consuming loop when dimming is already on.
Fixes bug
6320003.
Change-Id: If26dc5b0800300d8e38c166824651223eded4cfa
Daniel Sandler [Wed, 11 Apr 2012 14:03:00 +0000 (07:03 -0700)]
Merge "Fix PowerMgr NPE on emulator."
satok [Wed, 11 Apr 2012 07:12:59 +0000 (00:12 -0700)]
Merge "Show physical keyboard control button on the input method switch dialog"
satok [Mon, 9 Apr 2012 12:08:27 +0000 (21:08 +0900)]
Show physical keyboard control button on the input method switch dialog
Bug:
5240095
Change-Id: Ica768083f95c33dc1e494a28ba7d8b6eb989b0ef
Jeff Brown [Wed, 11 Apr 2012 03:36:07 +0000 (20:36 -0700)]
Be more careful about exceptions in input callbacks.
consumeEvents() may be called reentrantly so we need to be
careful when handling exceptions. When called directly
through JNI, the exception should be allowed to bubble up
to the caller. When called from a Looper callback, the
exception should be recorded on the MessageQueue and bubbled
when the call to nativePollOnce() returns.
Bug:
6312938
Change-Id: Ief5e315802f586aa85af7eef1bd6e9bea4ce24ab
Jeff Brown [Tue, 10 Apr 2012 21:30:49 +0000 (14:30 -0700)]
Request key maps from input manager service.
Instead of each application loading the KeyCharacterMap from
the file system, get them from the input manager service as
part of the InputDevice object.
Refactored InputManager to be a proper singleton instead of
having a bunch of static methods.
InputManager now maintains a cache of all InputDevice objects
that it has loaded. Currently we never invalidate the cache
which can cause InputDevice to return stale motion ranges if
the device is reconfigured. This will be fixed in a future change.
Added a fake InputDevice with ID -1 to represent the virtual keyboard.
Change-Id: If7a695839ad0972317a5aab89e9d1e42ace28eb7
Mangesh Ghiware [Wed, 11 Apr 2012 01:00:06 +0000 (18:00 -0700)]
Merge "On double-tap, simply zoom in if content is too wide."
Adam Powell [Wed, 11 Apr 2012 00:58:25 +0000 (17:58 -0700)]
Merge "Avoid potential leaks with Runnables posted from ProgressBar"
Adam Powell [Wed, 11 Apr 2012 00:19:20 +0000 (17:19 -0700)]
Avoid potential leaks with Runnables posted from ProgressBar
Bug
6093695
Handle pending progress updates when a view is not attached when the
view becomes attached again. Batch pending progress updates together
rather than posting separate runnables for each.
Change-Id: I5dea671d5b9fbe1302912ca4734a63955e77ff4d
Mangesh Ghiware [Wed, 11 Apr 2012 00:42:49 +0000 (17:42 -0700)]
On double-tap, simply zoom in if content is too wide.
Bug:
6257654
Change-Id: I6963476300619d6f0d6af46630f9a86d95ad0dfc
Dan Morrill [Wed, 11 Apr 2012 00:13:17 +0000 (17:13 -0700)]
Merge "Adding a line for android-debuggable to 'dump badging' if AndroidManifest.xml is configured as such. This is to be used by e.g. Play Store to warn the developer that they are about to publish a security hole."
Dianne Hackborn [Tue, 10 Apr 2012 22:54:19 +0000 (15:54 -0700)]
Hide the callback for activity animation options.
Not something I want to be stuck reporting forever.
Change-Id: Iab13fb7abb23d466492230242bfbae29f1fd01f3
Dianne Hackborn [Tue, 10 Apr 2012 22:25:43 +0000 (15:25 -0700)]
Merge "Some small tweaks to improve memory management."
Robert Ly [Tue, 10 Apr 2012 22:13:41 +0000 (15:13 -0700)]
am
82321d1f: am
23f08c6d: Merge "docs: fixing broken link for bug
6104366" into ics-mr1
* commit '
82321d1fbfdd544225ca063a1d43a3a9c53ea5df':
Amith Yamasani [Tue, 10 Apr 2012 22:13:39 +0000 (15:13 -0700)]
Bind to the correct face lock service.
When switching users, bind to the correct instance of FaceLock.
Tried to get the facelock screen to show up when switching users, but it
doesn't. Power off/on works, but not switching between users on the
lockscreen. Maybe a timing issue? Or not calling some function to make
the overlay visible?
Change-Id: I9300971331c7f0ed93ae7da28170342629426b20
Robert Ly [Tue, 10 Apr 2012 22:13:39 +0000 (15:13 -0700)]
am
2ce5444d: am
2e9dac4b: Merge "docs: fixing ndk bug
5991108" into ics-mr1
* commit '
2ce5444d638e9504521e155ffdbb363f88cdc534':
Robert Ly [Tue, 10 Apr 2012 22:13:37 +0000 (15:13 -0700)]
am
c4bbc7b4: am
876b7b87: Merge "docs: fixing renderscript doc bug
6111834" into ics-mr1
* commit '
c4bbc7b4e44c2292d1fdfc7fa4cfac6a55fc3da9':
Android Git Automerger [Tue, 10 Apr 2012 22:09:20 +0000 (15:09 -0700)]
am
d1ba6895: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
* commit '
d1ba68955947c208831711efdf2d6c4e5fb86d84':
Robert Ly [Tue, 10 Apr 2012 22:09:13 +0000 (15:09 -0700)]
am
bc8eaa7d: am
11d33b3d: am
23f08c6d: Merge "docs: fixing broken link for bug
6104366" into ics-mr1
* commit '
bc8eaa7d63865ee2532014419a0e384c62c7027e':
Robert Ly [Tue, 10 Apr 2012 22:09:11 +0000 (15:09 -0700)]
Robert Ly [Tue, 10 Apr 2012 22:09:09 +0000 (15:09 -0700)]
am
21b2ec79: am
9fd8aaca: am
876b7b87: Merge "docs: fixing renderscript doc bug
6111834" into ics-mr1
* commit '
21b2ec7980b405f5c808a265c04cc1b3f1ae23de':
Android Git Automerger [Tue, 10 Apr 2012 22:01:06 +0000 (15:01 -0700)]
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
Dianne Hackborn [Mon, 9 Apr 2012 21:06:16 +0000 (14:06 -0700)]
Some small tweaks to improve memory management.
We now allow processes that currently have stopping activities to
be managed as if they were done stopping, so that memory trimming
can be done before the process goes to the background. Hopefully
this will reduce cases where the processes goes to the background
and immediately gets killed, but wouldn't have had to be killed if
it had a chance to trim its memory.
Also change window memory trimming to always do the aggressive
trimming when memory is critical, even if not on a low-end device.
And tweak web view trimming to not trim for foreground UI events.
Change-Id: I241b3152b52d09757bd14a202477cf69c9b78786
Robert Ly [Tue, 10 Apr 2012 21:34:04 +0000 (14:34 -0700)]
am
d87121f4: am
c71a1bb9: am
23f08c6d: Merge "docs: fixing broken link for bug
6104366" into ics-mr1
* commit '
d87121f46efd48f63f3cd181c8ff081f11ff0feb':
docs: fixing broken link for bug
6104366
Robert Ly [Tue, 10 Apr 2012 21:34:03 +0000 (14:34 -0700)]
am
07ced01f: am
9585dcc4: am
2e9dac4b: Merge "docs: fixing ndk bug
5991108" into ics-mr1
* commit '
07ced01f0420ec0d70b1dd38e41e9b3b121fffb0':
docs: fixing ndk bug
5991108
Robert Ly [Tue, 10 Apr 2012 21:34:00 +0000 (14:34 -0700)]
am
12d80df0: am
86b6e26c: am
876b7b87: Merge "docs: fixing renderscript doc bug
6111834" into ics-mr1
* commit '
12d80df0b276b5d7e3e56388c02108a3a1f864cb':
docs: fixing renderscript doc bug
6111834
Craig Mautner [Tue, 10 Apr 2012 21:33:07 +0000 (14:33 -0700)]
Merge "Fix NPE in setTransparentRegion."
Robert Ly [Tue, 10 Apr 2012 21:30:34 +0000 (14:30 -0700)]
am
11d33b3d: am
23f08c6d: Merge "docs: fixing broken link for bug
6104366" into ics-mr1
* commit '
11d33b3da5fa8c46be17135deecdded9f11b61a0':
docs: fixing broken link for bug
6104366
Robert Ly [Tue, 10 Apr 2012 21:30:32 +0000 (14:30 -0700)]
am
b3f7fc2f: am
2e9dac4b: Merge "docs: fixing ndk bug
5991108" into ics-mr1
* commit '
b3f7fc2f7769defa8c7de9254f0cba163a2ea63e':
docs: fixing ndk bug
5991108
Robert Ly [Tue, 10 Apr 2012 21:30:30 +0000 (14:30 -0700)]
am
9fd8aaca: am
876b7b87: Merge "docs: fixing renderscript doc bug
6111834" into ics-mr1
* commit '
9fd8aaca4762f0852c016af34db696eebd4bfc92':
docs: fixing renderscript doc bug
6111834
Jeff Brown [Tue, 10 Apr 2012 21:30:20 +0000 (14:30 -0700)]
Merge "Don't reuse StringBuilder outside of lock when dumping ANR."
Robert Ly [Tue, 10 Apr 2012 21:30:15 +0000 (14:30 -0700)]
am
c71a1bb9: am
23f08c6d: Merge "docs: fixing broken link for bug
6104366" into ics-mr1
* commit '
c71a1bb9d455b547cba73947d13a50933c1cb1be':
docs: fixing broken link for bug
6104366
Robert Ly [Tue, 10 Apr 2012 21:30:13 +0000 (14:30 -0700)]
am
9585dcc4: am
2e9dac4b: Merge "docs: fixing ndk bug
5991108" into ics-mr1
* commit '
9585dcc48a561a87bfe3aa3c08192afbd969f4bf':
docs: fixing ndk bug
5991108
Robert Ly [Tue, 10 Apr 2012 21:30:11 +0000 (14:30 -0700)]
am
86b6e26c: am
876b7b87: Merge "docs: fixing renderscript doc bug
6111834" into ics-mr1
* commit '
86b6e26c78bf5d491a2cf2aa06e3812be326d722':
docs: fixing renderscript doc bug
6111834
Robert Ly [Tue, 10 Apr 2012 21:26:28 +0000 (14:26 -0700)]
am
23f08c6d: Merge "docs: fixing broken link for bug
6104366" into ics-mr1
* commit '
23f08c6d64976989f6519b4c65f2006865e8fd76':
docs: fixing broken link for bug
6104366
Robert Ly [Tue, 10 Apr 2012 21:26:27 +0000 (14:26 -0700)]
am
23f08c6d: Merge "docs: fixing broken link for bug
6104366" into ics-mr1
* commit '
23f08c6d64976989f6519b4c65f2006865e8fd76':
docs: fixing broken link for bug
6104366
Jeff Brown [Tue, 10 Apr 2012 21:26:26 +0000 (14:26 -0700)]
Don't reuse StringBuilder outside of lock when dumping ANR.
The ANR dumping code was reusing the shared StringBuilder while
not holding the ActivityManagerService lock. As a result, other
threads could sweep in and clobber the ANR information.
We don't want to hold the lock here, so just create a new StringBuilder.
Change-Id: I0d91af55f5c123102cfab2cd97035491efed59c0
Robert Ly [Tue, 10 Apr 2012 21:26:26 +0000 (14:26 -0700)]
am
2e9dac4b: Merge "docs: fixing ndk bug
5991108" into ics-mr1
* commit '
2e9dac4b0584bce238fed60ba2801af3e7a2c003':
docs: fixing ndk bug
5991108
Robert Ly [Tue, 10 Apr 2012 21:26:25 +0000 (14:26 -0700)]
am
2e9dac4b: Merge "docs: fixing ndk bug
5991108" into ics-mr1
* commit '
2e9dac4b0584bce238fed60ba2801af3e7a2c003':
docs: fixing ndk bug
5991108
Robert Ly [Tue, 10 Apr 2012 21:26:23 +0000 (14:26 -0700)]
am
876b7b87: Merge "docs: fixing renderscript doc bug
6111834" into ics-mr1
* commit '
876b7b876e6ebb08979cf1a4861910215c4aae2b':
docs: fixing renderscript doc bug
6111834
Robert Ly [Tue, 10 Apr 2012 21:26:19 +0000 (14:26 -0700)]
am
876b7b87: Merge "docs: fixing renderscript doc bug
6111834" into ics-mr1
* commit '
876b7b876e6ebb08979cf1a4861910215c4aae2b':
docs: fixing renderscript doc bug
6111834
Robert Ly [Tue, 10 Apr 2012 21:26:10 +0000 (14:26 -0700)]
am
23f08c6d: Merge "docs: fixing broken link for bug
6104366" into ics-mr1
* commit '
23f08c6d64976989f6519b4c65f2006865e8fd76':
docs: fixing broken link for bug
6104366
Robert Ly [Tue, 10 Apr 2012 21:26:08 +0000 (14:26 -0700)]
am
2e9dac4b: Merge "docs: fixing ndk bug
5991108" into ics-mr1
* commit '
2e9dac4b0584bce238fed60ba2801af3e7a2c003':
docs: fixing ndk bug
5991108
Robert Ly [Tue, 10 Apr 2012 21:26:07 +0000 (14:26 -0700)]
am
876b7b87: Merge "docs: fixing renderscript doc bug
6111834" into ics-mr1
* commit '
876b7b876e6ebb08979cf1a4861910215c4aae2b':
docs: fixing renderscript doc bug
6111834
Craig Mautner [Tue, 10 Apr 2012 21:24:38 +0000 (14:24 -0700)]
Fix NPE in setTransparentRegion.
Check for null Surface before using it.
Fixes bug
6312835.
Change-Id: Iaaac2a5d88e81b88e369815e09818c268085e4b7
Robert Ly [Tue, 10 Apr 2012 21:24:00 +0000 (14:24 -0700)]
Merge "docs: fixing broken link for bug
6104366" into ics-mr1
Robert Ly [Tue, 10 Apr 2012 21:23:50 +0000 (14:23 -0700)]
Merge "docs: fixing ndk bug
5991108" into ics-mr1
Robert Ly [Tue, 10 Apr 2012 21:23:37 +0000 (14:23 -0700)]
Merge "docs: fixing renderscript doc bug
6111834" into ics-mr1
Craig Mautner [Tue, 10 Apr 2012 21:23:10 +0000 (14:23 -0700)]
Merge "Fix IndexOutOfBoundsException."
George Mount [Tue, 10 Apr 2012 21:23:07 +0000 (14:23 -0700)]
Merge "Revert "Revert "Keep selection handles in edit fields."""
Eric Fischer [Tue, 10 Apr 2012 21:22:52 +0000 (14:22 -0700)]
Merge "Import translations. DO NOT MERGE"
Jack Palevich [Tue, 10 Apr 2012 21:20:28 +0000 (14:20 -0700)]
Merge "Notify monitor waiters when changing mSurfaceIsBad value."
Jeff Sharkey [Tue, 10 Apr 2012 21:01:53 +0000 (14:01 -0700)]
Merge "Move to Android-specific NTP pool."
Jeff Sharkey [Tue, 10 Apr 2012 20:48:10 +0000 (13:48 -0700)]
Move to Android-specific NTP pool.
Use "2.android.pool.ntp.org" since it returns both IPv4 and IPv6
addresses. Verified that NTP client works correctly on both.
Change-Id: I0187ef4a6d3b353cfcc77957b1303ca01c67cbe9
George Mount [Tue, 10 Apr 2012 20:41:51 +0000 (13:41 -0700)]
Revert "Revert "Keep selection handles in edit fields.""
This reverts commit
90c08eafad72454a31282fd887ec23d357c904a4
Gilles Debunne [Tue, 10 Apr 2012 20:36:40 +0000 (13:36 -0700)]
Merge "Removed exception from SpannableStringBuilder"
Eric Laurent [Tue, 10 Apr 2012 20:32:22 +0000 (13:32 -0700)]
Merge "audio preprocessing: added static factory method"
Gilles Debunne [Tue, 10 Apr 2012 20:25:33 +0000 (13:25 -0700)]
Removed exception from SpannableStringBuilder
Bug
6312196
Change-Id: I9cece36b40d8948e0e85bd433954818991009ad5
Robert Ly [Tue, 10 Apr 2012 20:30:45 +0000 (13:30 -0700)]
docs: fixing ndk bug
5991108
Change-Id: I70b5505fc424b278ea8977955857c92082a1f828
Eric Fischer [Tue, 10 Apr 2012 20:29:58 +0000 (13:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I988480b6b1ff1b745b4126ef89ee57b97513d6e2
Robert Ly [Tue, 10 Apr 2012 20:20:44 +0000 (13:20 -0700)]
docs: fixing broken link for bug
6104366
Change-Id: Ic8f7a9c5540cc0dd2251b7373e80b1f9ab6d8aa9
Craig Mautner [Mon, 9 Apr 2012 22:23:59 +0000 (15:23 -0700)]
Fix IndexOutOfBoundsException.
This fix resolves an exception thrown when the snapshot ArrayList has
no entries.
Fixes bug
6311207.
Change-Id: I84383417116a4a62eb2842792ed04096aebc8ee2
George Mount [Tue, 10 Apr 2012 20:16:03 +0000 (13:16 -0700)]
Merge "Revert "Keep selection handles in edit fields.""
George Mount [Tue, 10 Apr 2012 20:14:48 +0000 (13:14 -0700)]
Revert "Keep selection handles in edit fields."
This reverts commit
5d84368a7577c5d53ce885cd2d095cc5ba40d924
Craig Mautner [Tue, 10 Apr 2012 20:01:12 +0000 (13:01 -0700)]
Merge "Reduce load on CPU when animating rotation."
Craig Mautner [Tue, 10 Apr 2012 19:56:27 +0000 (12:56 -0700)]
Reduce load on CPU when animating rotation.
This change keeps requestTraversalLocked from being called on virtually
every call to animate while rotating.
Change-Id: I6d2db37db3bb82f4f9ecc84b17dbf121819a6c1b
Eric Laurent [Mon, 9 Apr 2012 21:25:48 +0000 (14:25 -0700)]
audio preprocessing: added static factory method
Added static methods to check availability and create audio preprocessing
effects.
Change-Id: I945e97fe41912ff8880befacaba162a08b5a1267
George Mount [Tue, 10 Apr 2012 19:33:58 +0000 (12:33 -0700)]
Merge "Keep selection handles in edit fields."
Daniel Sandler [Tue, 10 Apr 2012 19:14:35 +0000 (15:14 -0400)]
Fix PowerMgr NPE on emulator.
Bug:
6313695
Change-Id: Ib12b9102df01603df135cef03fd2a2f6e3634dd1
Robert Ly [Tue, 10 Apr 2012 17:57:33 +0000 (10:57 -0700)]
docs: fixing renderscript doc bug
6111834
Change-Id: Iea6fdaf03a0064462d57e4b62500ad689ba2b824
Gilles Debunne [Tue, 10 Apr 2012 18:00:57 +0000 (11:00 -0700)]
Merge "Faster and simpler replace in SSB, take two"
Dianne Hackborn [Tue, 10 Apr 2012 17:31:28 +0000 (10:31 -0700)]
Merge "Hide the optional permission stuff, not making it in to JB."
Teng-Hui Zhu [Tue, 10 Apr 2012 16:13:54 +0000 (09:13 -0700)]
am
6e32ebdf: (-s ours) am
bbc46ae7: am
544f89ae: Update SurfaceTexture interface for forward compatibility
* commit '
6e32ebdff1365d754ad3ad8e156aa941d162d129':
Update SurfaceTexture interface for forward compatibility
Teng-Hui Zhu [Tue, 10 Apr 2012 15:42:23 +0000 (08:42 -0700)]
am
bbc46ae7: am
544f89ae: Update SurfaceTexture interface for forward compatibility
* commit '
bbc46ae7499bc0fa67612c67dd23c1758336c935':
Update SurfaceTexture interface for forward compatibility
Teng-Hui Zhu [Tue, 10 Apr 2012 15:38:39 +0000 (08:38 -0700)]
am
544f89ae: Update SurfaceTexture interface for forward compatibility
* commit '
544f89aece46e8f4bbe4eed93116c8736e68ac07':
Update SurfaceTexture interface for forward compatibility
Teng-Hui Zhu [Mon, 9 Apr 2012 21:51:48 +0000 (14:51 -0700)]
Update SurfaceTexture interface for forward compatibility
Change-Id: I32d224428c0127800714a976b4d7bb68cc7c2464
Brian Colonna [Tue, 10 Apr 2012 13:25:26 +0000 (06:25 -0700)]
Merge "Passing useLiveliness flag to FUL in startUi call"
Jack Palevich [Tue, 10 Apr 2012 12:56:19 +0000 (05:56 -0700)]
Notify monitor waiters when changing mSurfaceIsBad value.
Otherwise the waiters might not wake up, leading to ANRs.
Bug:
6307843
Change-Id: I0646b4e8368f80dbff46342f75709992796973fd
Daniel Sandler [Tue, 10 Apr 2012 12:33:07 +0000 (05:33 -0700)]
Merge "New Android Dreams architecture, disabled for now."
Scott Main [Tue, 10 Apr 2012 06:59:12 +0000 (23:59 -0700)]
am
37250468: am
be36ea9e: am
a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1
* commit '
372504684fa0f74c290e0eaf7134979a55118fea':
Scott Main [Tue, 10 Apr 2012 06:55:47 +0000 (23:55 -0700)]
am
be36ea9e: am
a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1
* commit '
be36ea9e04df8f3b97dec7793e37fa1d1465922b':
Jesse Hall [Tue, 10 Apr 2012 05:43:34 +0000 (22:43 -0700)]
Merge "Avoid waking EGL in getInitCount"
Jesse Hall [Tue, 10 Apr 2012 05:41:04 +0000 (22:41 -0700)]
Merge "Release the scratch pbuffer surface after use"
Dianne Hackborn [Tue, 10 Apr 2012 00:45:06 +0000 (17:45 -0700)]
Merge "Fix issue #
6309296: Framework returns Configuration.SCREENLAYOUT_SIZE_LARGE for Xoom"
Scott Main [Tue, 10 Apr 2012 00:14:59 +0000 (17:14 -0700)]
am
2f133265: am
b92851d8: am
a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1
* commit '
2f133265d0eb601885a608114b6bbc5b8a710f16':
Scott Main [Tue, 10 Apr 2012 00:11:42 +0000 (17:11 -0700)]
am
14d3b807: am
a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1
* commit '
14d3b807b730e04d90d6dd9c9569decdf12cc9cb':
docs: Add 101 class about supporting various devices
Scott Main [Tue, 10 Apr 2012 00:11:21 +0000 (17:11 -0700)]
am
b92851d8: am
a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1
* commit '
b92851d850a778d1a2e5a797c2ddd315b61b15f9':
docs: Add 101 class about supporting various devices
Scott Main [Tue, 10 Apr 2012 00:08:28 +0000 (17:08 -0700)]
am
a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1
* commit '
a5894871b2a64f8ef80089a8ca962227c4d77155':
docs: Add 101 class about supporting various devices
Scott Main [Tue, 10 Apr 2012 00:08:11 +0000 (17:08 -0700)]
am
a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1
* commit '
a5894871b2a64f8ef80089a8ca962227c4d77155':
docs: Add 101 class about supporting various devices
Scott Main [Tue, 10 Apr 2012 00:08:09 +0000 (17:08 -0700)]
am
a5894871: Merge "docs: Add 101 class about supporting various devices" into ics-mr1
* commit '
a5894871b2a64f8ef80089a8ca962227c4d77155':
docs: Add 101 class about supporting various devices
Scott Main [Tue, 10 Apr 2012 00:06:15 +0000 (17:06 -0700)]
Merge "docs: Add 101 class about supporting various devices" into ics-mr1
John Grossman [Tue, 10 Apr 2012 00:00:24 +0000 (17:00 -0700)]
am
e1d6c080: Make common_time more deferential when coming out of networkless mode.
* commit '
e1d6c080f0b1769637d742e51cc22167c7af12bb':
Make common_time more deferential when coming out of networkless mode.
Adam Powell [Mon, 9 Apr 2012 23:49:47 +0000 (16:49 -0700)]
Merge "Restrictions for action buttons with text"
OSDN Git Service
