OSDN Git Service
Martijn Coenen [Thu, 5 Apr 2012 16:37:11 +0000 (09:37 -0700)]
Merge "Patch to support MIFARE with SAK 0x01"
Yu Shan Emily Lau [Thu, 5 Apr 2012 04:20:54 +0000 (21:20 -0700)]
Merge "Insert the 2 seconds before test start to workaround the race conditon for requesting the surface."
Yu Shan Emily Lau [Thu, 5 Apr 2012 04:17:04 +0000 (21:17 -0700)]
Insert the 2 seconds before test start to
workaround the race conditon for requesting
the surface.
Change-Id: Ic8ba358400492860b0d38fc71468ea4bb4d3d7bd
Daniel Sandler [Thu, 5 Apr 2012 03:40:22 +0000 (23:40 -0400)]
Fix crash in legacy notification construction path.
Bug:
6293584
Change-Id: I8c1c5162a2e9e3ebc5a6d3fed045c6c6a64b9bfd
Romain Guy [Thu, 5 Apr 2012 02:47:34 +0000 (19:47 -0700)]
Merge "Make sure we clean up after ourselves"
Bart Sears [Thu, 5 Apr 2012 02:36:54 +0000 (19:36 -0700)]
Merge "Update WebSettings.PREVIOUS_VERSION"
Svetoslav Ganov [Thu, 5 Apr 2012 02:01:13 +0000 (19:01 -0700)]
Merge "Fixing broken clear focus behavior."
Romain Guy [Thu, 5 Apr 2012 01:25:53 +0000 (18:25 -0700)]
Make sure we clean up after ourselves
Because of the mAdded=false statement a few lines above, a large section
of doDie() was not executed. Things would eventually get cleaned up
but it seems better to do it at the right time.
Change-Id: I1a2f3a8e05057dd7cd7205b6d3f9c145d6c0241d
Romain Guy [Thu, 5 Apr 2012 01:16:38 +0000 (18:16 -0700)]
Merge "Add a new OnDrawListener to ViewRoot"
Romain Guy [Thu, 5 Apr 2012 00:29:03 +0000 (17:29 -0700)]
Add a new OnDrawListener to ViewRoot
This can be used by app to efficiently listen for draw passes. This listener
is guaranteed to not generate any garbage unlike OnPreDrawListener.
Change-Id: Ida40d11a3f8a5d2617bafe722906ee5c9af48602
Scott Main [Thu, 5 Apr 2012 00:54:19 +0000 (17:54 -0700)]
am
31361742: am
153f8fe4: docs: Android U: Displaying Bitmaps Efficiently
* commit '
31361742b7a971f2998feac854e181dc100d5bf1':
docs: Android U: Displaying Bitmaps Efficiently
Scott Main [Thu, 5 Apr 2012 00:51:08 +0000 (17:51 -0700)]
am
153f8fe4: docs: Android U: Displaying Bitmaps Efficiently
* commit '
153f8fe420506a7e1b7a8f6b4d07db798867746e':
docs: Android U: Displaying Bitmaps Efficiently
Daniel Sandler [Thu, 5 Apr 2012 00:49:24 +0000 (17:49 -0700)]
Merge "Chronometer support in Notifications."
Scott Main [Thu, 5 Apr 2012 00:45:24 +0000 (17:45 -0700)]
docs: Android U: Displaying Bitmaps Efficiently
Change-Id: I749f6dd82438fc0902b892e9b918243fc0a826d3
Svetoslav Ganov [Wed, 4 Apr 2012 23:44:39 +0000 (16:44 -0700)]
Fixing broken clear focus behavior.
1. In a prevous patch I fixed the issues when on clearing
focus of the first focusable view the callback for
gaining focus were called before the ones for losing
focus. Since it cause some issues the patch was reverted
and resubmitted. In this chaos some code was missed so
tests are failing. Added the missing logic to give focus
to the first focusable in the current touch mode when
a view loses focus.
2. Removed clear focusForRemoval methid since it is a dup
of unFocus();
Note: All focus tests now pass.
Change-Id: I06881d4b5a66fc5a33efca16a96f20207a7220d3
Trevor Johns [Wed, 4 Apr 2012 23:55:57 +0000 (16:55 -0700)]
am
655aff22: am
e07b5850: Merge "Docs: Fixing typo in "Testing from Other IDEs" article" into ics-mr1
* commit '
655aff22aad883131b72ad879ed18f1a11380dbe':
Docs: Fixing typo in "Testing from Other IDEs" article
Trevor Johns [Wed, 4 Apr 2012 23:52:53 +0000 (16:52 -0700)]
am
e07b5850: Merge "Docs: Fixing typo in "Testing from Other IDEs" article" into ics-mr1
* commit '
e07b58506579085b62fde0771b74111b24aa27a0':
Docs: Fixing typo in "Testing from Other IDEs" article
Martijn Coenen [Wed, 4 Apr 2012 23:51:40 +0000 (16:51 -0700)]
Merge "First cut at Bluetooth Beam"
Trevor Johns [Wed, 4 Apr 2012 23:51:18 +0000 (16:51 -0700)]
Merge "Docs: Fixing typo in "Testing from Other IDEs" article" into ics-mr1
Trevor Johns [Wed, 4 Apr 2012 23:38:28 +0000 (16:38 -0700)]
Docs: Fixing typo in "Testing from Other IDEs" article
Fixing typo in Dev Guide article: 'android update-test-project'
should be 'android update test-project'.
Change-Id: Ie42a0b627d30d2a72fa081ca13bceaacdfd5aa03
http://developer.android.com/guide/developing/testing/testing_otheride.html
Bart Sears [Wed, 4 Apr 2012 23:13:26 +0000 (16:13 -0700)]
Update WebSettings.PREVIOUS_VERSION
Now that we have released ICS MR1.1, update the PREVIOUS_VERSION
to 4.0.4.
Change-Id: I3c4d6abfa679f20776d2676c57af4c0347e41c7b
Chris Craik [Wed, 4 Apr 2012 23:09:21 +0000 (16:09 -0700)]
Merge "remove toast from animation benchmark"
Brian Muramatsu [Wed, 4 Apr 2012 23:03:34 +0000 (16:03 -0700)]
Merge "Try Alternate Constructor for Single Method Tests"
Justin Koh [Wed, 4 Apr 2012 22:27:37 +0000 (15:27 -0700)]
Fix the build.
Change-Id: Ibe818df8f360837688f12533cf0ac22ef89a8439
Fred Chung [Wed, 4 Apr 2012 21:56:40 +0000 (14:56 -0700)]
am
37d51784: am
f336b9fc: Merge "Updated sample app for Android Training class: Making Your App Location Aware." into ics-mr1
* commit '
37d51784850bd6cd34c0291dcac7d3a06cf77407':
Roman Nurik [Wed, 4 Apr 2012 21:56:37 +0000 (14:56 -0700)]
am
8659a2d1: am
fa840e2b: Merge "docs: Android Design: v3 update (settings, navigation)" into ics-mr1
* commit '
8659a2d190acd1226ca8076681831963b169c963':
Justin Koh [Wed, 4 Apr 2012 21:54:19 +0000 (14:54 -0700)]
Merge "resolved conflicts for merge of
bff6a514 to master"
Philip Milne [Wed, 4 Apr 2012 21:51:34 +0000 (14:51 -0700)]
Merge "Fix for bug
6104272."
Justin Koh [Wed, 4 Apr 2012 21:50:27 +0000 (14:50 -0700)]
resolved conflicts for merge of
bff6a514 to master
Change-Id: I741d5ab8ed0ce25a27330ffb55ba210534d11c3d
Marco Nelissen [Wed, 4 Apr 2012 21:09:49 +0000 (14:09 -0700)]
Store video width/height when scanning
b/
5820120
Change-Id: If2faf554bbf49b341d2634915ba98c1efd70574e
Andreas Huber [Wed, 4 Apr 2012 21:21:18 +0000 (14:21 -0700)]
Merge "New Crypto JAVA class to facilitate decryption via MediaCodec."
Fabrice Di Meglio [Wed, 4 Apr 2012 21:17:22 +0000 (14:17 -0700)]
Merge "Add View textAlignment"
Chris Craik [Wed, 4 Apr 2012 21:15:59 +0000 (14:15 -0700)]
remove toast from animation benchmark
Change-Id: I9ec2aa57fafbde5875c2f070fe4a33e4d33ee2ae
Nick Pelly [Wed, 4 Apr 2012 00:46:00 +0000 (17:46 -0700)]
First cut at Bluetooth Beam
Change-Id: I37e5759515ff8779095b6d8adf5ad9c456fa8529
Andreas Huber [Wed, 4 Apr 2012 21:06:32 +0000 (14:06 -0700)]
New Crypto JAVA class to facilitate decryption via MediaCodec.
Change-Id: Ic4e395faa84f003793c2804f2badabab9e7f1034
related-to-bug:
6275919
Amith Yamasani [Wed, 4 Apr 2012 20:49:05 +0000 (13:49 -0700)]
Merge "Embed layout padding in nine patch images"
Irfan Sheriff [Wed, 4 Apr 2012 20:22:19 +0000 (13:22 -0700)]
Merge "Fix build"
Irfan Sheriff [Wed, 4 Apr 2012 20:18:17 +0000 (13:18 -0700)]
Fix build
Add missing file
Change-Id: I5ed1827e1183c37741675ce4d198d3e200c5fb94
Chia-chi Yeh [Wed, 4 Apr 2012 20:13:57 +0000 (13:13 -0700)]
Merge "SIP: push the logic of finding local address down to SipSessionGroup."
Chia-chi Yeh [Wed, 4 Apr 2012 20:04:26 +0000 (13:04 -0700)]
SIP: push the logic of finding local address down to SipSessionGroup.
This allows different accounts binding on different IP addresses,
such as one on IPv4 and another on IPv6.
Bug:
4169057
Change-Id: I0bb36669394c281330091673fa338adea8f782cd
Daniel Sandler [Tue, 3 Apr 2012 20:42:00 +0000 (16:42 -0400)]
Chronometer support in Notifications.
@hidden for now while we experiment with it in Phone.
Change-Id: Ib6ca3a8262f676d49d81e081a30c6d994c732a6b
Irfan Sheriff [Wed, 4 Apr 2012 19:34:52 +0000 (12:34 -0700)]
Merge "Add initial framework for DNS service discovery"
Irfan Sheriff [Wed, 4 Apr 2012 19:34:47 +0000 (12:34 -0700)]
Merge "Original DnsSd TxtRecord file"
Irfan Sheriff [Wed, 4 Apr 2012 19:29:26 +0000 (12:29 -0700)]
Merge "Fix key handling"
Irfan Sheriff [Fri, 23 Mar 2012 00:01:39 +0000 (17:01 -0700)]
Add initial framework for DNS service discovery
Change-Id: I53c0b7ebfd75e520ebb7553612f1aa8413b6b79b
Fabrice Di Meglio [Wed, 14 Mar 2012 02:37:57 +0000 (19:37 -0700)]
Add View textAlignment
- fix bug #
6163772
- use bits field and pack them as much as possible
- take care of "supportsRtl" flag from Manifest
- add visual unit tests
CTS unit tests in another CL
Change-Id: Ib77c4eb423854209af130688c5ef9977401a9c1c
Philip Milne [Wed, 4 Apr 2012 00:38:43 +0000 (17:38 -0700)]
Fix for bug
6104272.
Add Java properties for those XML attributes that don't have getter/setter
pairs. Also, link existing methods to their XML attributes where the comments
were previously missing.
This CL is worth extra scruitiny: first because it's View, and secondly
because many of the new APIs depend on subtleties in the underlying implementations
that I'm not familiar with.
Also, please consider whether it is too much to deprecate getBackgroundDrawable().
Change-Id: I0f2641926d86e5f44b92a0057736f64b59d2e9b9
Amith Yamasani [Wed, 4 Apr 2012 17:27:15 +0000 (10:27 -0700)]
Embed layout padding in nine patch images
- Added a new custom PNG chunk that carries the layout padding ints.
- Extract the padding ticks from .9.png images and store in the chunk.
- Load the padding information at runtime into Bitmap and NinePatchDrawable.
- The new chunk is ordered first so that it doesn't cause a problem in older
versions of the platform.
Bug:
6087201
Change-Id: I5de46167a1d44b3ec21065b0c165e594b1dc8399
Daniel Sandler [Wed, 4 Apr 2012 19:03:49 +0000 (12:03 -0700)]
Merge "Fix vertical alignment of notification contents."
Daniel Sandler [Wed, 4 Apr 2012 19:00:26 +0000 (15:00 -0400)]
Fix vertical alignment of notification contents.
Change-Id: Ibbb237f1b892cb0605417cdef17a9e59316ecb1f
Craig Mautner [Wed, 4 Apr 2012 19:00:48 +0000 (12:00 -0700)]
Merge "First separation of animation from AppWindowToken."
Craig Mautner [Wed, 4 Apr 2012 18:58:50 +0000 (11:58 -0700)]
Merge "Move more items between layout and animate sides."
Craig Mautner [Wed, 4 Apr 2012 18:56:44 +0000 (11:56 -0700)]
First separation of animation from AppWindowToken.
New class AppWindowAnimator pulls animation out of AppWindowToken.
Change-Id: Ic1ccb6ec2bf091f1f901fe3c20cbeb242376ae6b
Yoshihiko Ikenaga [Mon, 2 Apr 2012 08:34:38 +0000 (17:34 +0900)]
Fix key handling
putListener() returns 0 when the argument is null. And The key value of listener
registered first is always 0. For this reason, if the p2p functions are called continuously
and first call is without listener and the second call is with listener, then the message
against first call wrongly pick up the second call's listener because the key value is
the same. In order to avoid this issue, we don't use 0 as the valid listener key.
Change-Id: I0cc960b2ad37f17cf7f528d839b39aa272b83670
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
Fred Chung [Wed, 4 Apr 2012 18:54:04 +0000 (11:54 -0700)]
am
2adda2d5: am
99b44fdc: am
f336b9fc: Merge "Updated sample app for Android Training class: Making Your App Location Aware." into ics-mr1
* commit '
2adda2d594954d338993f579503ab3e5f339ac8a':
Updated sample app for Android Training class: Making Your App Location Aware.
Romain Guy [Wed, 4 Apr 2012 18:53:28 +0000 (11:53 -0700)]
Merge "Disable AA lines vertex attrib arrays after rendering"
Fred Chung [Wed, 4 Apr 2012 18:51:12 +0000 (11:51 -0700)]
am
99b44fdc: am
f336b9fc: Merge "Updated sample app for Android Training class: Making Your App Location Aware." into ics-mr1
* commit '
99b44fdc87d3eac2feb17ab2409b0b66ca9333ba':
Updated sample app for Android Training class: Making Your App Location Aware.
Fred Chung [Wed, 4 Apr 2012 18:48:01 +0000 (11:48 -0700)]
am
f336b9fc: Merge "Updated sample app for Android Training class: Making Your App Location Aware." into ics-mr1
* commit '
f336b9fce8b11c70b633bd71612544eaf2b9298b':
Updated sample app for Android Training class: Making Your App Location Aware.
Fred Chung [Wed, 4 Apr 2012 18:47:48 +0000 (11:47 -0700)]
am
f336b9fc: Merge "Updated sample app for Android Training class: Making Your App Location Aware." into ics-mr1
* commit '
f336b9fce8b11c70b633bd71612544eaf2b9298b':
Updated sample app for Android Training class: Making Your App Location Aware.
Fred Chung [Wed, 4 Apr 2012 18:45:21 +0000 (11:45 -0700)]
Merge "Updated sample app for Android Training class: Making Your App Location Aware." into ics-mr1
Romain Guy [Wed, 4 Apr 2012 18:38:54 +0000 (11:38 -0700)]
Disable AA lines vertex attrib arrays after rendering
Change-Id: I2f035e9d87f4f97bc1e37355c84570fd58df0374
Irfan Sheriff [Tue, 3 Apr 2012 19:13:27 +0000 (12:13 -0700)]
Original DnsSd TxtRecord file
Change-Id: I4aa308a3b417d6bdce50567fb66c7119b048140a
Martijn Coenen [Wed, 4 Apr 2012 18:19:08 +0000 (11:19 -0700)]
Merge "Add API for querying extended length APDU support."
Martijn Coenen [Wed, 4 Apr 2012 18:12:52 +0000 (11:12 -0700)]
Merge "Document "disable default Beam" meta-data entry."
Roman Nurik [Wed, 4 Apr 2012 18:05:40 +0000 (11:05 -0700)]
am
6644efe6: am
7dc67f51: am
fa840e2b: Merge "docs: Android Design: v3 update (settings, navigation)" into ics-mr1
* commit '
6644efe63c86d25ecaf54d88cf15336f53baa369':
Roman Nurik [Wed, 4 Apr 2012 18:02:37 +0000 (11:02 -0700)]
am
b328cc3e: am
32a035d1: am
fa840e2b: Merge "docs: Android Design: v3 update (settings, navigation)" into ics-mr1
* commit '
b328cc3e813f38917860aff3b85e045de835856c':
docs: Android Design: v3 update (settings, navigation)
Roman Nurik [Wed, 4 Apr 2012 18:01:27 +0000 (11:01 -0700)]
am
7dc67f51: am
fa840e2b: Merge "docs: Android Design: v3 update (settings, navigation)" into ics-mr1
* commit '
7dc67f51272de42112d51a912c352ff2dc3aaf9c':
Roman Nurik [Wed, 4 Apr 2012 17:58:53 +0000 (10:58 -0700)]
am
32a035d1: am
fa840e2b: Merge "docs: Android Design: v3 update (settings, navigation)" into ics-mr1
* commit '
32a035d165f43b72d961a71192c902eba581dd0e':
docs: Android Design: v3 update (settings, navigation)
Roman Nurik [Wed, 4 Apr 2012 17:57:24 +0000 (10:57 -0700)]
am
fa840e2b: Merge "docs: Android Design: v3 update (settings, navigation)" into ics-mr1
* commit '
fa840e2b9f7e8b5655fa262cd063800188dec216':
docs: Android Design: v3 update (settings, navigation)
Roman Nurik [Wed, 4 Apr 2012 17:55:55 +0000 (10:55 -0700)]
am
fa840e2b: Merge "docs: Android Design: v3 update (settings, navigation)" into ics-mr1
* commit '
fa840e2b9f7e8b5655fa262cd063800188dec216':
docs: Android Design: v3 update (settings, navigation)
Roman Nurik [Wed, 4 Apr 2012 17:55:49 +0000 (10:55 -0700)]
am
fa840e2b: Merge "docs: Android Design: v3 update (settings, navigation)" into ics-mr1
* commit '
fa840e2b9f7e8b5655fa262cd063800188dec216':
docs: Android Design: v3 update (settings, navigation)
Roman Nurik [Wed, 4 Apr 2012 17:53:58 +0000 (10:53 -0700)]
Merge "docs: Android Design: v3 update (settings, navigation)" into ics-mr1
Fred Chung [Wed, 4 Apr 2012 17:53:34 +0000 (10:53 -0700)]
Updated sample app for Android Training class: Making Your App Location Aware.
Change-Id: I819a79b337bbdc33948c17cc5456e6406eb3bf98
Martijn Coenen [Mon, 2 Apr 2012 21:52:10 +0000 (14:52 -0700)]
Document "disable default Beam" meta-data entry.
Change-Id: Icaa767ee37fcca08b1ff5143eb94cf8e66be840c
Martijn Coenen [Mon, 2 Apr 2012 22:56:07 +0000 (15:56 -0700)]
Add API for querying extended length APDU support.
Bug:
5813943
Change-Id: Iffb415f318e095bde9ed6677b22613d210f8a39c
Chet Haase [Wed, 4 Apr 2012 17:39:33 +0000 (10:39 -0700)]
Merge "Enhanced frame profiling from gfxinfo"
Roman Nurik [Thu, 29 Mar 2012 20:28:13 +0000 (13:28 -0700)]
docs: Android Design: v3 update (settings, navigation)
Change-Id: I351e82561432f4357b52d2b7d99ae0fafdf79688
Craig Mautner [Wed, 4 Apr 2012 17:23:31 +0000 (10:23 -0700)]
Move more items between layout and animate sides.
- Isolate DimAnimator animation from the layout side.
- Isolate mWallpaperForceHidingChanged and mOrientationChangeComplete
from the animation side.
- Eliminate a redundant setting of mOrientationChangeComplete to true.
It was already true at that point.
- Synchronize changes to mWindows and mAppTokens on mAnimator. This is
a nop until we go to multiple threads.
- Synchronize AppWindowToken.freezingScreen on mAnimator.
- Modification to repeat layout debugging including temporary enabling
of spew on layout repeats.
Change-Id: Ic8d82b1c197144aaf6957caa5f71e175288220f2
Gilles Debunne [Wed, 4 Apr 2012 17:14:13 +0000 (10:14 -0700)]
Merge "Removed spurious log about blinking cursor"
Gilles Debunne [Wed, 4 Apr 2012 17:12:05 +0000 (10:12 -0700)]
Removed spurious log about blinking cursor
Change-Id: I940c3847bb6e461178575480c82e7dd6739277cf
Justin Koh [Wed, 4 Apr 2012 16:45:27 +0000 (09:45 -0700)]
Merge "Persists the master mute volume setting." into ics-aah
Stephen Hines [Wed, 4 Apr 2012 15:12:56 +0000 (08:12 -0700)]
Merge "Revert "Build /system/bin/asan/app_process.""
Stephen Hines [Wed, 4 Apr 2012 15:12:46 +0000 (08:12 -0700)]
Revert "Build /system/bin/asan/app_process."
This reverts commit
cb5c734790e1e3d8496b4c75c57e8a537784c056
Stephen Hines [Wed, 4 Apr 2012 15:03:21 +0000 (08:03 -0700)]
Merge "Build /system/bin/asan/app_process."
Chet Haase [Tue, 3 Apr 2012 23:15:34 +0000 (16:15 -0700)]
Enhanced frame profiling from gfxinfo
You can now set the max number of frames being tracked by the gfxinfo
profiling data by doing 'adb shell setprop hwui.profil.maxframes #'.
Also, running gfxinfo automatically resets the data so that any set of
frame data always starts from the beginning.
Change-Id: I87ae3fb4d580741a1b2fba75be4ec540de7c52a4
Michael Jurka [Wed, 4 Apr 2012 08:55:00 +0000 (01:55 -0700)]
Merge "Fix bugs with popup menu in Recent Applications"
Michael Jurka [Wed, 4 Apr 2012 08:54:40 +0000 (01:54 -0700)]
Merge "Reducing height of scroll fade in Recents on phone"
Romain Guy [Wed, 4 Apr 2012 04:17:34 +0000 (21:17 -0700)]
Merge "New libhwui test activity"
Jeff Sharkey [Wed, 4 Apr 2012 04:15:34 +0000 (21:15 -0700)]
Merge "Hide Preference title when empty."
Romain Guy [Wed, 4 Apr 2012 03:22:10 +0000 (20:22 -0700)]
New libhwui test activity
Change-Id: I0ce4bc665f117d7c0ed47670ceb4ed6f9b54d85c
Jeff Sharkey [Wed, 4 Apr 2012 03:46:42 +0000 (20:46 -0700)]
Hide Preference title when empty.
Change-Id: I1c1d73f5a4647657c7da65c72192fbac061fe259
Romain Guy [Wed, 4 Apr 2012 02:33:06 +0000 (19:33 -0700)]
Merge "Optimize FBOs composition"
Romain Guy [Wed, 4 Apr 2012 02:30:26 +0000 (19:30 -0700)]
Optimize FBOs composition
Change-Id: Ifc8eada8922509373c0e4c3b2ed75b6f08d098de
Jason Noguchi [Wed, 4 Apr 2012 01:11:27 +0000 (18:11 -0700)]
am
f499a072: am
a784b3de: Fix build break introduced by missing parenthesis in camera stress test.
* commit '
f499a0722b329fd8954c43cb39ab6fbba23cfee4':
Megha Joshi [Wed, 4 Apr 2012 01:11:25 +0000 (18:11 -0700)]
am
24748143: am
43562ecf: Merge "Creating new "Optimizing for TV" training." into ics-mr1
* commit '
24748143afd155c14661031bcdacf28c890403a2':
Jason Noguchi [Wed, 4 Apr 2012 01:11:24 +0000 (18:11 -0700)]
am
e371ed8d: am
6e6d8df5: Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1
* commit '
e371ed8de54c42d2e0b8aa3fb7196670ff5ae9ee':
Scott Main [Wed, 4 Apr 2012 01:11:21 +0000 (18:11 -0700)]
am
fcdf5217: am
0687c830: Merge "docs: change markup for "new" tags to avoid the new tags wraping solo" into ics-mr1
* commit '
fcdf5217e0b43d119af0da30ff0066317154819d':
Fred Chung [Wed, 4 Apr 2012 01:11:19 +0000 (18:11 -0700)]
am
33c99ba6: am
04a73fb6: Merge "Android Training: Making Your App Location Aware" into ics-mr1
* commit '
33c99ba6978126d6ec57c83a91772f5a531851ec':
Jason Noguchi [Wed, 4 Apr 2012 00:40:21 +0000 (17:40 -0700)]
am
54cfceb6: am
4a219e6b: am
a784b3de: Fix build break introduced by missing parenthesis in camera stress test.
* commit '
54cfceb6ca4035d7cb0f83649b50bbc41e02d406':
Justin Koh [Wed, 4 Apr 2012 00:37:58 +0000 (17:37 -0700)]
Persists the master mute volume setting.
Persists the master mute volume setting across reboots.
TESTED = runs on Tungsten.
Change-Id: I9628b9369ca528b22413f62a9e7d697bae61d8ac