OSDN Git Service
Svetoslav Ganov [Wed, 21 May 2014 20:11:33 +0000 (20:11 +0000)]
Merge "Switching to the final PDF rendering library"
RoboErik [Wed, 21 May 2014 19:59:10 +0000 (19:59 +0000)]
Merge changes I1cbdff1d,I23906b4c
* changes:
Handle headsethook voice launching
Add 5s timeout to wakelock
justinzhang [Wed, 21 May 2014 19:58:34 +0000 (19:58 +0000)]
Merge "Use DeviecPolicyManager to authenticate lock task"
Svetoslav Ganov [Wed, 21 May 2014 19:30:05 +0000 (19:30 +0000)]
Switching to the final PDF rendering library
Change-Id: Id92674ce762af894a5c4b0df0f8e9a711131bccc
justinzhang [Mon, 12 May 2014 18:50:48 +0000 (14:50 -0400)]
Use DeviecPolicyManager to authenticate lock task
Uncomment lines in ActivityManagerService. Before start lock task,
ActivityMangerService calls DevicePolicyManager to see if the
app can go into lock task.
Change-Id: I9ad784d7cc637d45884dcb2623b4c59ff802f93d
Ed Heyl [Wed, 21 May 2014 19:23:29 +0000 (19:23 +0000)]
Merge "Fix the build: Revert "Switching to the final PDF rendering library""
Ed Heyl [Wed, 21 May 2014 19:21:06 +0000 (19:21 +0000)]
Fix the build: Revert "Switching to the final PDF rendering library"
This reverts commit
e7a8f476ea3873941ace96751fa2d633c95b7c10.
Change-Id: I457e45b0a536bbde721a3355ed860b2363e36467
Ihab Awad [Wed, 21 May 2014 19:07:24 +0000 (19:07 +0000)]
Merge "Add logging utilities to Telecomm classes"
Ihab Awad [Wed, 21 May 2014 05:32:12 +0000 (22:32 -0700)]
Add logging utilities to Telecomm classes
Add logging utility class from packages/services/Telecomm to the Telecomm
classes in the framework.
Change-Id: I54a9edc4daa24ffdeb15b08afc5ad8a238d04291
Glenn Kasten [Wed, 21 May 2014 18:38:41 +0000 (18:38 +0000)]
Merge "Update android.media.AudioTrack.getTimestamp API documentation"
Jeff Tinker [Tue, 20 May 2014 23:26:50 +0000 (16:26 -0700)]
Build cast v2 mediadrm signer library as non-static
bug:
13988104
Change-Id: Ie94074dd46e4489c7d4e0f378d1e35b14bb0c0ac
Vinod Krishnan [Wed, 21 May 2014 18:10:37 +0000 (18:10 +0000)]
am
82fa124c: am
4f65a545: Merge "Adding more DeviceDefault for CTS tests" into klp-modular-dev
* commit '
82fa124c3a2753ce70c04973d8004b2b1950993d':
Adding more DeviceDefault for CTS tests
George Mount [Wed, 21 May 2014 17:54:45 +0000 (17:54 +0000)]
Merge "Fixed inverse of listener assignment."
Vinod Krishnan [Wed, 21 May 2014 17:46:16 +0000 (17:46 +0000)]
am
4f65a545: Merge "Adding more DeviceDefault for CTS tests" into klp-modular-dev
* commit '
4f65a5456159b64185bb99c193bcff93b07770f8':
Adding more DeviceDefault for CTS tests
Svetoslav [Wed, 21 May 2014 17:43:13 +0000 (17:43 +0000)]
Merge "Switching to the final PDF rendering library"
Svetoslav [Wed, 21 May 2014 17:40:42 +0000 (10:40 -0700)]
Switching to the final PDF rendering library
Change-Id: I5bad4fc620378f3ca6b070bbaeee631f526b66c7
Vinod Krishnan [Wed, 21 May 2014 17:40:06 +0000 (17:40 +0000)]
Merge "Adding more DeviceDefault for CTS tests" into klp-modular-dev
Vinod Krishnan [Wed, 21 May 2014 17:28:57 +0000 (10:28 -0700)]
Adding more DeviceDefault for CTS tests
Bug:
15091518
Change-Id: Iddabacbd023f031c9c4ec6fd4c4f60ce17b606c4
Dan Sandler [Wed, 21 May 2014 17:28:43 +0000 (17:28 +0000)]
am
d0ec8438: am
7509733c: Elide extras strings from noman dumpsys output.
* commit '
d0ec8438820d936e13664ec052c01f14d8a4e8e3':
Elide extras strings from noman dumpsys output.
Alan Viverette [Wed, 21 May 2014 17:23:55 +0000 (17:23 +0000)]
Merge "Quantum popup nine-patch with baked-in shadow"
Jeff Sharkey [Wed, 21 May 2014 17:15:19 +0000 (17:15 +0000)]
am
fce708d2: am
9ef2117f: am
bc06158a: Merge "Check for null in LocalSocketImpl.SocketInputStream.available()"
* commit '
fce708d285506f65eb51a3256b2a04111e4054cc':
Check for null in LocalSocketImpl.SocketInputStream.available()
Glenn Kasten [Tue, 20 May 2014 22:48:53 +0000 (15:48 -0700)]
Update android.media.AudioTrack.getTimestamp API documentation
Change-Id: I0928c73c147ce843ae46565883da209b278fb3b4
Craig Mautner [Wed, 21 May 2014 16:35:27 +0000 (16:35 +0000)]
Merge "Change method name per API council request"
Dan Sandler [Wed, 21 May 2014 16:26:29 +0000 (16:26 +0000)]
am
7509733c: Elide extras strings from noman dumpsys output.
* commit '
7509733c8dfb4e65dbb45ab582e09d599dfaaa28':
Elide extras strings from noman dumpsys output.
Jeff Sharkey [Wed, 21 May 2014 16:13:18 +0000 (16:13 +0000)]
am
9ef2117f: am
bc06158a: Merge "Check for null in LocalSocketImpl.SocketInputStream.available()"
* commit '
9ef2117f0e65db60cb3f9708174bcaca4db813b2':
Check for null in LocalSocketImpl.SocketInputStream.available()
Jeff Sharkey [Wed, 21 May 2014 16:05:34 +0000 (16:05 +0000)]
am
bc06158a: Merge "Check for null in LocalSocketImpl.SocketInputStream.available()"
* commit '
bc06158a78297747605981702c8e41956ea1aa2d':
Check for null in LocalSocketImpl.SocketInputStream.available()
Jeff Sharkey [Wed, 21 May 2014 16:03:08 +0000 (16:03 +0000)]
Merge "Check for null in LocalSocketImpl.SocketInputStream.available()"
Dan Sandler [Fri, 16 May 2014 02:22:10 +0000 (22:22 -0400)]
Elide extras strings from noman dumpsys output.
Bug:
14292528
Change-Id: I19cfb6b692e6901fa7f115ea675b1b03fc5ba176
(cherry picked from commit
44de3cfc08428378b93172a2b03f9785a3638678)
Baligh Uddin [Wed, 21 May 2014 15:43:30 +0000 (15:43 +0000)]
am
9472cadd: (-s ours) am
ef2b35cc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
9472cadd2219fbe956ea6ba32853efc12abbf69f':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 21 May 2014 15:42:58 +0000 (15:42 +0000)]
Merge "Import translations. DO NOT MERGE"
George Mount [Wed, 21 May 2014 15:40:03 +0000 (08:40 -0700)]
Fixed inverse of listener assignment.
Change-Id: Icaa68d54c3f4ca74009edd19ef5ab197b73eb66a
Baligh Uddin [Wed, 21 May 2014 15:38:26 +0000 (15:38 +0000)]
am
ef2b35cc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
ef2b35cc2e87058ead622bd1858d358690c201fd':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 21 May 2014 15:34:27 +0000 (15:34 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 21 May 2014 15:34:27 +0000 (15:34 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 21 May 2014 15:34:21 +0000 (15:34 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 21 May 2014 15:34:19 +0000 (15:34 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 21 May 2014 15:34:16 +0000 (15:34 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 21 May 2014 15:34:17 +0000 (15:34 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 21 May 2014 15:34:09 +0000 (15:34 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 21 May 2014 15:34:08 +0000 (15:34 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 21 May 2014 15:34:11 +0000 (15:34 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 21 May 2014 15:34:06 +0000 (15:34 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 21 May 2014 15:33:52 +0000 (15:33 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 21 May 2014 15:33:44 +0000 (15:33 +0000)]
Merge "Import translations. DO NOT MERGE"
Emily Bernier [Wed, 21 May 2014 15:17:19 +0000 (15:17 +0000)]
Merge "Connect user audio restrictions to app ops."
Robin Lee [Wed, 21 May 2014 14:21:38 +0000 (14:21 +0000)]
Merge "Remove enforceManagedProfile for listing keyguard features"
Robin Lee [Wed, 21 May 2014 14:04:19 +0000 (15:04 +0100)]
Remove enforceManagedProfile for listing keyguard features
Change-Id: Ic89f09ada046f64b089b977868b6f37bc0a6de91
Yohei Yukawa [Wed, 21 May 2014 14:18:59 +0000 (14:18 +0000)]
Merge "Style fix and dead code removal"
Adrian Roos [Wed, 21 May 2014 14:04:42 +0000 (14:04 +0000)]
Merge "Add trust indicator to keyguard"
Yohei Yukawa [Wed, 21 May 2014 14:03:33 +0000 (14:03 +0000)]
Merge "Update InputMethodSubtypeSwitchingController correctly"
John Spurlock [Wed, 21 May 2014 13:59:19 +0000 (13:59 +0000)]
Merge "VolumeZen: SystemUI now hosts the volume dialog."
Brian Colonna [Wed, 21 May 2014 13:59:11 +0000 (13:59 +0000)]
Merge "Fix
14988763: FUL only shows on bouncer now"
John Spurlock [Tue, 20 May 2014 20:25:37 +0000 (16:25 -0400)]
VolumeZen: SystemUI now hosts the volume dialog.
- Allow SystemUI to set the volume controller interface using
a new binder call to audio service.
- Remove VolumePanel's dependency on AudioService.
- Host the base VolumePanel in the SystemUI process.
Change-Id: I095d5a1a579d42b68d0f81abb4087bd0c754b876
Yohei Yukawa [Wed, 21 May 2014 13:56:40 +0000 (22:56 +0900)]
Style fix and dead code removal
This CL does not change the existing behavior.
Smarter language switching will be coverted by subsequent CLs.
BUG:
7043015
Change-Id: I281a33191d44be448492c2b74760cb8680719124
George Mount [Wed, 21 May 2014 13:51:43 +0000 (13:51 +0000)]
Merge changes I2da66b54,I8a65428d
* changes:
Fix for quick "back" in Activity Transitions.
Enter and exit transitions are inverted in calling Activity.
Adrian Roos [Sat, 17 May 2014 01:11:59 +0000 (03:11 +0200)]
Add trust indicator to keyguard
Changes the unlock icon to an open lock
when the keyguard will not ask for credentials.
Bug:
14295559
Change-Id: If34a5ec9e23b2d22813860faee125e6b2d700643
Adrian Roos [Wed, 21 May 2014 13:44:06 +0000 (13:44 +0000)]
Merge "Add dumpsys facility and a history to TrustManagerService"
Yohei Yukawa [Wed, 21 May 2014 13:42:32 +0000 (22:42 +0900)]
Update InputMethodSubtypeSwitchingController correctly
User visible behavior is supposed to be identical with and
without this CL.
Previously, there is some corner cases where
InputMethodSubtypeSwitchingController#resetCircularListLocked is
not called but the list of enabled input method is updated.
Fortunately, this corner cases are not observable for a user
because we have not updated the the rotation order dynamically.
However we should fix this before implementing smarter rotation
algorithm that changes the rotation order dynamically.
BUG:
7043015
Change-Id: I145a514dc4cde369ba50431c408c916046ab0c6e
Dan Sandler [Fri, 16 May 2014 02:22:10 +0000 (22:22 -0400)]
Elide extras strings from noman dumpsys output.
Bug:
14292528
Change-Id: I19cfb6b692e6901fa7f115ea675b1b03fc5ba176
Chris Wren [Wed, 21 May 2014 12:36:05 +0000 (12:36 +0000)]
Merge "add ranking information to the dumpsys info"
Jeff Brown [Wed, 21 May 2014 11:16:58 +0000 (11:16 +0000)]
am
c2871696: am
6099fd21: Merge "Fix build." into klp-modular-dev
* commit '
c28716964c4525bf9a291404d7f14e74de23f36f':
Fix build.
Jeff Brown [Wed, 21 May 2014 11:16:52 +0000 (11:16 +0000)]
am
77669abb: am
9beccf9f: Merge "Defer display ready until brightness ramp completes." into klp-modular-dev
* commit '
77669abb8300b672700418216939b9253dc98bee':
Defer display ready until brightness ramp completes.
Narayan Kamath [Wed, 21 May 2014 11:07:35 +0000 (12:07 +0100)]
resolved conflicts for merge of
fcc4fed3 to master
Change-Id: Icebca982b01debd67a1470c02651ef8936f6e5b0
Sander Alewijnse [Wed, 21 May 2014 10:33:59 +0000 (10:33 +0000)]
Merge "Update comment of ACTION_PROFILE_PROVISIONING_COMPLETE."
Robin Lee [Wed, 21 May 2014 09:41:19 +0000 (09:41 +0000)]
Merge "DPM: Disallow some DeviceAdmin policies for ProfileOwners"
Robin Lee [Tue, 20 May 2014 15:26:49 +0000 (16:26 +0100)]
DPM: Disallow some DeviceAdmin policies for ProfileOwners
A profile owner should only have control over the profile. All of the
following device admin APIs that affect the device beyond the profile
that they are called from are now disallowed:
- Camera enable/disable
- Keyguard
- Wipe external storage
@bug
14434826
Change-Id: I69acfdf6f654f48b5db91aeb3ea86662d7857075
Sander Alewijnse [Wed, 21 May 2014 09:19:07 +0000 (09:19 +0000)]
Merge "Disallow adb sideloading if UserManager flag is set for user."
Sander Alewijnse [Wed, 14 May 2014 11:52:46 +0000 (12:52 +0100)]
Disallow adb sideloading if UserManager flag is set for user.
Solution is based on "redefining" the User_all.
Change-Id: Ie1ce5d6391e807f8caa05fe2a92009923d1032a8
Brian Carlstrom [Wed, 21 May 2014 09:08:16 +0000 (09:08 +0000)]
am
1d265716: am
e77a77d0: am
ec71fed0: Merge "Improve ABI handling for shared user ids."
* commit '
1d265716954122f79d5fdd9d953a98e303d298c9':
Improve ABI handling for shared user ids.
Jeff Brown [Wed, 21 May 2014 08:40:39 +0000 (08:40 +0000)]
am
6099fd21: Merge "Fix build." into klp-modular-dev
* commit '
6099fd21e190ffdf8e03ba6d96cce0d53c2765fd':
Fix build.
Jeff Brown [Wed, 21 May 2014 08:40:36 +0000 (08:40 +0000)]
am
9beccf9f: Merge "Defer display ready until brightness ramp completes." into klp-modular-dev
* commit '
9beccf9f9e28f74bd78041e4381b59ce0a2351e7':
Defer display ready until brightness ramp completes.
Jeff Brown [Wed, 21 May 2014 08:40:33 +0000 (08:40 +0000)]
am
6fb904bf: Merge "Make power button behavior configurable." into klp-modular-dev
* commit '
6fb904bfd1f943547d6e5bc6f199ffec2290da01':
Make power button behavior configurable.
Brian Carlstrom [Wed, 21 May 2014 08:27:03 +0000 (08:27 +0000)]
am
e77a77d0: am
ec71fed0: Merge "Improve ABI handling for shared user ids."
* commit '
e77a77d081ff9d05100702f5880f356da27fd087':
Improve ABI handling for shared user ids.
Brian Carlstrom [Wed, 21 May 2014 06:46:26 +0000 (06:46 +0000)]
am
ec71fed0: Merge "Improve ABI handling for shared user ids."
* commit '
ec71fed089965c4d731eaa90344849a1775f937a':
Improve ABI handling for shared user ids.
Jungshik Jang [Wed, 21 May 2014 06:43:09 +0000 (06:43 +0000)]
Merge "Add several actions for ARC (Audio Return Channel)"
Jungshik Jang [Tue, 20 May 2014 05:37:38 +0000 (14:37 +0900)]
Fix NullPointerException on init of HdmiMhlController.
Change-Id: I2f79ce0ef3a368c2fcc8d047de2dcad914679e0c
Brian Carlstrom [Wed, 21 May 2014 06:24:14 +0000 (06:24 +0000)]
Merge "Improve ABI handling for shared user ids."
Brian Carlstrom [Wed, 21 May 2014 06:01:06 +0000 (06:01 +0000)]
Merge "Improve ABI handling for shared user ids."
Alan Viverette [Wed, 21 May 2014 05:54:37 +0000 (22:54 -0700)]
Quantum popup nine-patch with baked-in shadow
Also updates background color for Quantum dark so that the shadow
is visible against the background.
BUG:
15120387
Change-Id: I19bf176491b5f2b82f9a38afe9593cb6e5592623
Jungshik Jang [Thu, 15 May 2014 05:05:24 +0000 (14:05 +0900)]
Add several actions for ARC (Audio Return Channel)
ARC channel is established by both TV and AV Reciever.
From TV, it sends <Request ARC Initiation> and AVR
responds with <Initiate ARC>.
From AVR, it can be initiated by sending <Initiate ARC> directly
to TV.
Once TV receives <Initiate ARC> it sets up ARC internally
and replies <Report ARC Initiated> to AVR.
Termination steps are almost same except for message name
(use Terminate instread of Initiation).
In order to implement the above steps, this change introduces
following classes.
RequestArcInitiation(Termination)Action:
handles <Request ARC Initiation> (<Request ARC Termination>)
RequestArcAction handles common logic of them.
SetArcTransmissionStateAction:
handles ARC set up, enabling/disabling ARC and
reports results to AVR.
<Initiate ARC> and <Terminate ARC> handles directly in
HdmiControlService
Along with this, this change has implmentation for
add&removeAction. To avoid synchronization issue
they are isolated to main thread.
Change-Id: I3c5cf7c777e6c1de50d63ce4643b191dfe15fe1f
Vinit Deshpande [Wed, 21 May 2014 01:42:36 +0000 (18:42 -0700)]
Make Wifi WPS API available on application layer
Un-hide WPS methods (and required interface classes, etc.) of WifiManager to
enable Apps to start/stop the WPS procedure, add a patch for WPS method
KEYPAD to avoid early failure callbacks. (Methods PBC, DISPLAY, KEYPAD
tested on 4.4.2_r2.)
Change-Id: I25aafdc4b637c87d754d4fdb70e40a34a569b738
Signed-off-by: Olaf Stoyke <o.stoyke@avm.de>
Jeff Brown [Wed, 21 May 2014 05:17:31 +0000 (05:17 +0000)]
Merge "Fix build." into klp-modular-dev
Jeff Brown [Wed, 21 May 2014 05:16:25 +0000 (22:16 -0700)]
Fix build.
Change-Id: I00f040ab16cf8a3b7a995b4626d49e70b97fb294
Narayan Kamath [Tue, 20 May 2014 12:55:09 +0000 (13:55 +0100)]
Improve ABI handling for shared user ids.
The key improvement is that we need to keep track of
the package that's currently being scanned (this includes
new installs and upgrades of existing packages) and treat
it specially. If we didn't do that, In the case of upgrades
we would perform the shared UID calculation based on the ABI
of the old package, and not the current package.
This change also allows us to perform the CPU ABI calculation
before dexopt, which saves us from having to do it twice and
fixes a bug where we were using the wrong package path to
dexopt a package.
This also has the side effect of fixing
15081286.
bug:
15081286
(cherry-picked from commit
b851c89d2252cf3d1dc504558ce1553527885316)
Change-Id: I20f8ad36941fc3df29007f0e83ce82f38f3585c8
Jeff Brown [Wed, 21 May 2014 05:09:15 +0000 (05:09 +0000)]
Merge "Defer display ready until brightness ramp completes." into klp-modular-dev
Jeff Brown [Wed, 21 May 2014 05:02:46 +0000 (22:02 -0700)]
Defer display ready until brightness ramp completes.
Bug:
14494096
Change-Id: I6da6fffbbce2c7058170e5c6139eae4cb5a06d88
Jason Sams [Wed, 21 May 2014 04:50:23 +0000 (04:50 +0000)]
Merge "Validate RenderScript context creation flags"
Jeff Brown [Wed, 21 May 2014 04:28:34 +0000 (04:28 +0000)]
Merge "Make power button behavior configurable." into klp-modular-dev
Jeff Brown [Wed, 21 May 2014 04:24:38 +0000 (21:24 -0700)]
Make power button behavior configurable.
Allow power button to be used to either go to sleep as usual,
which may doze, or skip that completely and really go to sleep.
May also really go to sleep and go home all at once.
Bug:
14406056
Change-Id: Ia19e2551b9c2a72271bb2eddd5c0d1749761e019
Yuhao Zheng [Wed, 21 May 2014 04:21:23 +0000 (04:21 +0000)]
Merge "Hotspot 2.0 framework - add implementation"
Wei Wang [Wed, 21 May 2014 00:59:36 +0000 (17:59 -0700)]
Add scan response as an advertising parameter(1/2).
Change-Id: I75c500dd7b5f2609d3092f50ba284a5ec4a41987
Griff Hazen [Wed, 21 May 2014 02:48:24 +0000 (02:48 +0000)]
am
08a8c2ca: am
ef6aae62: Merge "Fixes to WearableActionExtensions" into klp-modular-dev
* commit '
08a8c2ca45dc859e79d54990d2ae0392d475aeda':
Fixes to WearableActionExtensions
Griff Hazen [Wed, 21 May 2014 02:44:16 +0000 (02:44 +0000)]
am
ef6aae62: Merge "Fixes to WearableActionExtensions" into klp-modular-dev
* commit '
ef6aae62f6c92bc9413db60c28cc4b3230f4d2fa':
Fixes to WearableActionExtensions
Jeff Brown [Wed, 21 May 2014 02:41:06 +0000 (02:41 +0000)]
am
ccf51bef: am
2d9b513d: Merge "I\'m feeling the good vibrations." into klp-modular-dev
* commit '
ccf51bef288652cb618a566a376173e252b84af0':
I'm feeling the good vibrations.
Griff Hazen [Wed, 21 May 2014 02:41:01 +0000 (02:41 +0000)]
Merge "Fixes to WearableActionExtensions" into klp-modular-dev
Jeff Brown [Wed, 21 May 2014 02:41:00 +0000 (02:41 +0000)]
am
8f120dd6: am
0702786d: Merge "Allow display timeouts to be set in config.xml." into klp-modular-dev
* commit '
8f120dd6d631ac632d3356b81403a53f958021f0':
Allow display timeouts to be set in config.xml.
Jeff Brown [Wed, 21 May 2014 02:38:11 +0000 (02:38 +0000)]
am
2d9b513d: Merge "I\'m feeling the good vibrations." into klp-modular-dev
* commit '
2d9b513dab78242281bca125b4abc6b8235089a6':
I'm feeling the good vibrations.
Jeff Brown [Wed, 21 May 2014 02:38:07 +0000 (02:38 +0000)]
am
0702786d: Merge "Allow display timeouts to be set in config.xml." into klp-modular-dev
* commit '
0702786d81eb9f9bf47c3a0827d3f2824c3f4228':
Allow display timeouts to be set in config.xml.
Jeff Brown [Wed, 21 May 2014 02:35:09 +0000 (02:35 +0000)]
Merge "I'm feeling the good vibrations." into klp-modular-dev
Dirk Dougherty [Wed, 21 May 2014 02:34:43 +0000 (02:34 +0000)]
am
3dc330af: am
f7963fab: am
c1bb79d9: am
bb0b8449: Remove monetization image in edu guidelines.
* commit '
3dc330af6b590ebd3c6529e8b123f51cebb134e2':
Remove monetization image in edu guidelines.