OSDN Git Service
John Spurlock [Tue, 28 Oct 2014 20:04:19 +0000 (20:04 +0000)]
Merge "Zen: Fix quantity format specifiers for quantity=1." into lmp-mr1-dev
Santos Cordon [Tue, 28 Oct 2014 20:01:00 +0000 (20:01 +0000)]
Merge "Update javadocs for Telecom APIs." into lmp-mr1-dev
Jeff Davidson [Tue, 28 Oct 2014 20:00:31 +0000 (20:00 +0000)]
Merge "Check UID instead of package name when preparing VPN." into lmp-mr1-dev
John Spurlock [Tue, 28 Oct 2014 19:49:25 +0000 (15:49 -0400)]
Zen: Fix quantity format specifiers for quantity=1.
Bug:
16824863
Change-Id: I3c7fc5961cd65b0b8291b7d9aef6110e6dfe85f1
Joe Fernandez [Tue, 28 Oct 2014 19:28:36 +0000 (19:28 +0000)]
am
5c0ed74b: am
40bf63e0: Merge "docs: Update timing of Android Wear app review" into lmp-docs
automerge:
56a8cb7
* commit '
56a8cb7fd1eff26da30c4ebcb58eae71b9774b81':
docs: Update timing of Android Wear app review
David Friedman [Tue, 28 Oct 2014 19:27:37 +0000 (19:27 +0000)]
am
b2d582d9: am
3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs
automerge:
b648cab
* commit '
b648cabadfd73bcd3fa8b88db48007f58739300e':
Updates Notifications screenshot for Android 5.0.
Eric Gilmore [Tue, 28 Oct 2014 19:26:43 +0000 (19:26 +0000)]
am
9a6aa0ff: am
d126294a: Docs: Adding Android Studio instructions for adding IAB service.
automerge:
77760e7
* commit '
77760e753eb9a6c533eb2b52f228149e49356f64':
Docs: Adding Android Studio instructions for adding IAB service.
Quddus Chong [Tue, 28 Oct 2014 19:25:57 +0000 (19:25 +0000)]
am
6face8a0: am
2b4b3d28: cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
automerge:
eb07af2
* commit '
eb07af2ced7aa438dca941fcde2e3ca0b338a620':
cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
Ricardo Cervera [Tue, 28 Oct 2014 19:25:10 +0000 (19:25 +0000)]
am
f4e32145: am
61fcad92: docs: Add SearchXonY to Common Intents
automerge:
be07f2a
* commit '
be07f2a853cb2a69eeecbd7b0d68f455b55edae6':
docs: Add SearchXonY to Common Intents
Joe Fernandez [Tue, 28 Oct 2014 19:22:45 +0000 (19:22 +0000)]
am
5c0ed74b: am
40bf63e0: Merge "docs: Update timing of Android Wear app review" into lmp-docs
* commit '
5c0ed74b3886c5765c576e9e427b93c76b37635a':
docs: Update timing of Android Wear app review
David Friedman [Tue, 28 Oct 2014 19:22:40 +0000 (19:22 +0000)]
am
b2d582d9: am
3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs
* commit '
b2d582d995622cc8379603cfadae7ee6d4163b3e':
Updates Notifications screenshot for Android 5.0.
Eric Gilmore [Tue, 28 Oct 2014 19:22:37 +0000 (19:22 +0000)]
am
9a6aa0ff: am
d126294a: Docs: Adding Android Studio instructions for adding IAB service.
* commit '
9a6aa0ffa460aca1df9ef03501dd6b20b483198b':
Docs: Adding Android Studio instructions for adding IAB service.
Quddus Chong [Tue, 28 Oct 2014 19:22:15 +0000 (19:22 +0000)]
am
6face8a0: am
2b4b3d28: cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
* commit '
6face8a04c1aa695a744f12ee2ca0e18cdfb5ed0':
cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
Ricardo Cervera [Tue, 28 Oct 2014 19:22:11 +0000 (19:22 +0000)]
am
f4e32145: am
61fcad92: docs: Add SearchXonY to Common Intents
* commit '
f4e32145a214b28522d67e748c0eff74aa915bf6':
docs: Add SearchXonY to Common Intents
Jason Monk [Tue, 28 Oct 2014 18:45:33 +0000 (18:45 +0000)]
Merge "QS: Bring back BT/Wi-Fi sub-panels" into lmp-mr1-dev
Jason Monk [Tue, 28 Oct 2014 18:27:04 +0000 (18:27 +0000)]
Merge "Add hotspot icon to status bar" into lmp-mr1-dev
Joe Fernandez [Tue, 28 Oct 2014 18:15:33 +0000 (18:15 +0000)]
am
40bf63e0: Merge "docs: Update timing of Android Wear app review" into lmp-docs
* commit '
40bf63e0f04b336325c370fbe4c6a8563ba5e2b7':
docs: Update timing of Android Wear app review
David Friedman [Tue, 28 Oct 2014 18:15:28 +0000 (18:15 +0000)]
am
3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs
* commit '
3c00bc01f9c6e82a0859201f74237998b24872da':
Updates Notifications screenshot for Android 5.0.
Eric Gilmore [Tue, 28 Oct 2014 18:15:24 +0000 (18:15 +0000)]
am
d126294a: Docs: Adding Android Studio instructions for adding IAB service.
* commit '
d126294a8f954fb758d3f67bc5271014748ba9e7':
Docs: Adding Android Studio instructions for adding IAB service.
Quddus Chong [Tue, 28 Oct 2014 18:15:20 +0000 (18:15 +0000)]
am
2b4b3d28: cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
* commit '
2b4b3d289bb26607c8db198dae4bcfbf6247b0c1':
cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
Ricardo Cervera [Tue, 28 Oct 2014 18:15:17 +0000 (18:15 +0000)]
am
61fcad92: docs: Add SearchXonY to Common Intents
* commit '
61fcad92ab55e3f874eb8fddde39dbe64235c2e5':
docs: Add SearchXonY to Common Intents
Jason Monk [Mon, 27 Oct 2014 15:38:47 +0000 (11:38 -0400)]
QS: Bring back BT/Wi-Fi sub-panels
Bluetooth has stayed pretty much the same, just came back.
Wi-Fi now shows the currently available networks like settings does.
Networks that require extra steps are taken to Settings to complete
the process.
Bug:
17722817
Change-Id: Idfcfd92f557b20168693ced26d4001f3708f08a4
Adam Lesinski [Tue, 28 Oct 2014 17:41:10 +0000 (17:41 +0000)]
Merge "libandroidfw: Do not build device library when building SDK" into lmp-mr1-dev
John Spurlock [Tue, 28 Oct 2014 17:08:42 +0000 (17:08 +0000)]
Merge "Zen: Show "(until 4:56 PM)" in exit conditions." into lmp-mr1-dev
Santos Cordon [Mon, 27 Oct 2014 21:57:49 +0000 (14:57 -0700)]
Update javadocs for Telecom APIs.
Bug:
18142177
Change-Id: I78461f3634d281a6927cec9c555825a1bdab7a24
George Mount [Tue, 28 Oct 2014 17:01:23 +0000 (17:01 +0000)]
Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev
George Mount [Tue, 28 Oct 2014 17:00:42 +0000 (17:00 +0000)]
Merge "Fixed: Nested shared elements now transition separately." into lmp-mr1-dev
John Spurlock [Tue, 28 Oct 2014 15:21:42 +0000 (11:21 -0400)]
Zen: Show "(until 4:56 PM)" in exit conditions.
Implement two-line exit conditions, display the duration + end
time on separate lines.
Bug:
16824863
Change-Id: I8dabc83042fce604ccb86b463b9bb547c7903c64
Nicolas Prevot [Tue, 28 Oct 2014 16:33:32 +0000 (16:33 +0000)]
Merge "Replace minimum with maximum in method description." into lmp-mr1-dev
Nicolas Prevot [Mon, 1 Sep 2014 11:24:05 +0000 (12:24 +0100)]
Replace minimum with maximum in method description.
BUG:
18152344
Change-Id: If5d09051e8f74addf53018cfd3be214d96efb9e6
Benjamin Franz [Tue, 28 Oct 2014 16:13:03 +0000 (16:13 +0000)]
Merge "Send ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED Broadcast when a user restriction has been changed." into lmp-mr1-dev
Jorim Jaggi [Mon, 27 Oct 2014 12:45:56 +0000 (13:45 +0100)]
Fix jank when launching something from lockscreen
Apparently, hideRecents blocks around 300ms so we avoid this as a
low-risk fix. In the longer term, we should investigate why it takes
so long.
Bug:
18133433
Change-Id: I3eae659d4720d3c95280e7f7a144e00f0c760388
Adrian Roos [Tue, 28 Oct 2014 15:23:12 +0000 (15:23 +0000)]
Merge changes Iecd1303f,I2076c500 into lmp-mr1-dev
* changes:
Fix NPE in FlashlightController
Fix stale unlock icon
Adrian Roos [Tue, 28 Oct 2014 14:37:37 +0000 (14:37 +0000)]
Merge "Ensure trust agents are disabled in safe-mode" into lmp-mr1-dev
Craig Mautner [Tue, 28 Oct 2014 13:56:06 +0000 (13:56 +0000)]
Merge "Do not go through a layout if visibility is GONE" into lmp-mr1-dev
Jason Monk [Mon, 27 Oct 2014 19:28:22 +0000 (15:28 -0400)]
Add hotspot icon to status bar
Bug:
17318034
Change-Id: I291fe6bf7ac8c2faffd37cfda436ef050c1c5ca5
Christoph Studer [Tue, 28 Oct 2014 12:41:32 +0000 (12:41 +0000)]
Merge "NoMan: Add update bit to notification_enqueue log" into lmp-mr1-dev
Ari Sachter-Zeltzer [Tue, 28 Oct 2014 08:58:21 +0000 (08:58 +0000)]
Merge "fixed jank on activity close exit with better alpha interpolation" into lmp-mr1-dev
Erik Kline [Tue, 28 Oct 2014 07:53:36 +0000 (07:53 +0000)]
Merge "(re)define the definition of "provisioned"" into lmp-mr1-dev
Lorenzo Colitti [Tue, 28 Oct 2014 07:00:30 +0000 (07:00 +0000)]
Merge "Change removeStackedLink to take an interface name." into lmp-mr1-dev
Lorenzo Colitti [Mon, 20 Oct 2014 02:08:03 +0000 (11:08 +0900)]
Change removeStackedLink to take an interface name.
This simplifies callers.
Also remove all "implementations" of addStackedLink and
removeStackedLink except the one in LinkProperties, because they
are unused.
Bug:
12111730
Change-Id: Ie294b855facba4b1436299dcb3211b72d9ba448e
Erik Kline [Fri, 24 Oct 2014 12:50:20 +0000 (21:50 +0900)]
(re)define the definition of "provisioned"
Specifically:
[1] provide a hasIPv4(), and
[2] a hasIPv6()
each of which requires an IP address, a default route, and
address-family-specific DNS servers to evaluate to true.
Additionally:
[3] redefine isProvisioned() to return the logical OR
of [1] and [2] above.
Any external caller can still use any of the has*() methods to
construct its own, different definition of "provisioned".
Bug:
17769720
Change-Id: Ia692fb8508484ff403d3920c94d0e1db4563f807
Lajos Molnar [Tue, 28 Oct 2014 03:28:17 +0000 (03:28 +0000)]
Merge "MediaCodec/Image: handle null cropRect correctly" into lmp-mr1-dev
Joe Fernandez [Tue, 28 Oct 2014 03:25:39 +0000 (03:25 +0000)]
Merge "docs: Update timing of Android Wear app review" into lmp-docs
Joe Fernandez [Tue, 28 Oct 2014 00:39:53 +0000 (17:39 -0700)]
docs: Update timing of Android Wear app review
Change-Id: If3d31a9828b5934a871964139b8abc6b12fe8586
David Friedman [Tue, 28 Oct 2014 02:51:30 +0000 (02:51 +0000)]
Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs
David Friedman [Tue, 28 Oct 2014 00:16:44 +0000 (17:16 -0700)]
Updates Notifications screenshot for Android 5.0.
Change-Id: Ib5a3f88ef5d9e580550a18d83568913d6b5d3cef
Griff Hazen [Tue, 28 Oct 2014 02:23:34 +0000 (02:23 +0000)]
DO NOT MERGE Fix lmp-sprout-dev build for generics addition
automerge:
732e4ec -s ours
* commit '
732e4ecbee3168c19e49469934f0e1cd3268e001':
DO NOT MERGE Fix lmp-sprout-dev build for generics addition
Jason Monk [Tue, 28 Oct 2014 02:21:20 +0000 (02:21 +0000)]
Add missing passive discovery flag automerge:
4444c5b
automerge:
07faf0e
* commit '
07faf0e1a1d32408dfdc863a0996baa8522c5fdb':
Add missing passive discovery flag
Ying Wang [Tue, 28 Oct 2014 02:20:25 +0000 (02:20 +0000)]
Update current.txt with generics to field types. automerge:
79775d4
automerge:
475d739 -s ours
* commit '
475d7393bf0cbb80dd1911df30a6ba0292da09c3':
Update current.txt with generics to field types.
Griff Hazen [Tue, 28 Oct 2014 02:19:22 +0000 (19:19 -0700)]
DO NOT MERGE Fix lmp-sprout-dev build for generics addition
Change-Id: I66f10264476df5504086a7fbc24d729798187d05
Yuncheol Heo [Tue, 28 Oct 2014 01:04:06 +0000 (01:04 +0000)]
Merge "CEC: Send <ReportMenuStatus:active> together sending <ActiveSource>." into lmp-mr1-dev
Alan Viverette [Tue, 28 Oct 2014 00:57:10 +0000 (00:57 +0000)]
Merge "Play CLICK sound effect when compound buttons are clicked" into lmp-mr1-dev
Jason Monk [Tue, 28 Oct 2014 00:52:56 +0000 (00:52 +0000)]
Add missing passive discovery flag
automerge:
4444c5b
* commit '
4444c5b27874866f18cd8f4abb8914cc17857ea7':
Add missing passive discovery flag
Alan Viverette [Tue, 28 Oct 2014 00:50:51 +0000 (17:50 -0700)]
Play CLICK sound effect when compound buttons are clicked
Also plays the sound effect when the switch changes state as a result
of dragging, since that's effectively the same as the click action.
BUG:
16308311
Change-Id: Ic187ece2a8190082617f5ac7aaf05c3511fa80b5
Ying Wang [Tue, 28 Oct 2014 00:42:04 +0000 (17:42 -0700)]
Update current.txt with generics to field types.
Bug:
17014855
Change-Id: I14672092f79374f6c5b2362bd3c2aaac84e0c2ae
Winson Chung [Mon, 27 Oct 2014 23:39:09 +0000 (23:39 +0000)]
Merge "Fixing potential crash when the task loader is stopped. (Bug
18135583)" into lmp-mr1-dev
Jeff Sharkey [Mon, 27 Oct 2014 23:35:57 +0000 (23:35 +0000)]
Merge "Check upgrade certs before permissions." into lmp-mr1-dev
John Reck [Mon, 27 Oct 2014 23:27:29 +0000 (23:27 +0000)]
Merge "Cleanup debug options" into lmp-mr1-dev
Jason Monk [Mon, 27 Oct 2014 23:20:02 +0000 (19:20 -0400)]
Add missing passive discovery flag
MediaProjectionManagerService had an active media callback which
was causing a service to be bound 100% of the time. Adding a
passive flag makes it only observe events, and allow the service
to only be bound when needed by apps requesting active discovery.
Bug:
18042409
Bug:
17969854
Change-Id: I1bfa6609e2aa507ee2ce227de50f0e5ae951e000
Eric Gilmore [Fri, 10 Oct 2014 21:24:11 +0000 (14:24 -0700)]
Docs: Adding Android Studio instructions for adding IAB service.
Incorporating some editorial feedback both in and outside the
scope of my small bug fix.
Bug:
17151052
Change-Id: Id3b0c256ca6f7f018fa525eeb1f78979e8f476df
Alan Viverette [Mon, 27 Oct 2014 23:16:25 +0000 (23:16 +0000)]
Merge "Fix min/max date range in DatePicker calendar mode" into lmp-mr1-dev
Wale Ogunwale [Mon, 27 Oct 2014 23:05:38 +0000 (23:05 +0000)]
Merge "Added documentation for various window frame types." into lmp-mr1-dev
Alan Viverette [Mon, 27 Oct 2014 22:39:11 +0000 (22:39 +0000)]
Merge "Clean up some javadocs in Window.setFeature...()" into lmp-mr1-dev
Jeff Sharkey [Mon, 27 Oct 2014 22:38:25 +0000 (15:38 -0700)]
Check upgrade certs before permissions.
We're now checking for permission redefinition early during the
install process, which can result in a confusing error message when
the real problem is a mis-signed app. So do a quick signature
sanity check before checking permissions.
Bug:
18095637
Change-Id: I9a9b48da9c5dc7fb9bde6f3f338ea08e53b6b705
Ying Wang [Mon, 27 Oct 2014 22:35:59 +0000 (22:35 +0000)]
Update current.txt with generics to field types.
automerge:
79775d4
* commit '
79775d4bc4fa71994942dbd1d441aa62827c34be':
Update current.txt with generics to field types.
Jeff Sharkey [Mon, 27 Oct 2014 22:01:57 +0000 (22:01 +0000)]
Merge "Follow API removal." into lmp-mr1-dev
Lajos Molnar [Mon, 27 Oct 2014 21:54:33 +0000 (14:54 -0700)]
MediaCodec/Image: handle null cropRect correctly
- allow Media.Image.setCropRect(null) to unset cropRect
- use full image if cropRect is null in MediaCodec$Image
Bug:
18124320
Change-Id: I7abb6175402a1fe913e16c0a682fabee79c55741
Jeff Sharkey [Mon, 27 Oct 2014 21:53:40 +0000 (14:53 -0700)]
Follow API removal.
Bug:
18118003
Change-Id: Iad73ce748e05ba0660246e8dbb041415c187f792
Quddus Chong [Mon, 27 Oct 2014 01:10:42 +0000 (18:10 -0700)]
cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
Change-Id: Ic7402251219a84be92d4e58863fd069de6aa4446
Craig Mautner [Thu, 23 Oct 2014 20:16:53 +0000 (13:16 -0700)]
Do not go through a layout if visibility is GONE
An unnecessary layout based on dimensions changing catches up
with us later when the next layout doesn't occur.
In this case
we layed out the Settings panel because visibility changed from
visible to GONE and the requested width/height didn't match the
current window width height. When the visibility changed back
to visible the dimensions matched and another layout was not
performed.
This fix delays the layout until the window becomes visible again.
Fixes bug
17681754.
Change-Id: I0a3ff9479dca93e78c5d3a3df40faceffc10ecbd
George Mount [Mon, 27 Oct 2014 21:25:12 +0000 (14:25 -0700)]
Fix NPE in moveSharedElementsToOverlay
Bug
18119532
Change-Id: I334bda2d63427032583a15a483e000412024c150
Mike Lockwood [Mon, 27 Oct 2014 21:10:21 +0000 (21:10 +0000)]
Merge "Improve toString() methods for audio classes to help with debugging" into lmp-mr1-dev
Mike Lockwood [Mon, 27 Oct 2014 20:34:45 +0000 (13:34 -0700)]
Improve toString() methods for audio classes to help with debugging
bug:
18139399
Change-Id: I6076f9f5daa3b485bc80a4ff1b16a583e6c93f67
Jeff Sharkey [Mon, 27 Oct 2014 21:02:07 +0000 (21:02 +0000)]
Merge "Follow ArraySet refactoring." into lmp-mr1-dev
Jeff Sharkey [Mon, 27 Oct 2014 20:49:56 +0000 (13:49 -0700)]
Follow ArraySet refactoring.
Bug:
18115729
Change-Id: I2c32965b621b5bb57ff3bde02b00b31b59a5cd6d
Jeff Sharkey [Mon, 27 Oct 2014 20:38:05 +0000 (20:38 +0000)]
Merge "Drop DEV network stats to save RAM." into lmp-mr1-dev
Dake Gu [Mon, 27 Oct 2014 20:23:26 +0000 (20:23 +0000)]
Merge "ActivityTransition: Encode scaleType and matrix in snapshot view" into lmp-mr1-dev
Jeff Sharkey [Mon, 27 Oct 2014 19:56:59 +0000 (19:56 +0000)]
Merge "Reduce PackageManager RAM usage: ArrayMap/Set." into lmp-mr1-dev
John Reck [Mon, 27 Oct 2014 19:38:48 +0000 (12:38 -0700)]
Cleanup debug options
Bug:
18138852
Bug:
18065434
Change-Id: Ibb07b73b147c2a8b287fe8aee3f6624582f21b00
Eric Laurent [Mon, 27 Oct 2014 19:40:29 +0000 (19:40 +0000)]
Merge "audioservice: fix default stream volume" into lmp-mr1-dev
winsonchung [Mon, 27 Oct 2014 19:01:14 +0000 (12:01 -0700)]
Fixing potential crash when the task loader is stopped. (Bug
18135583)
Change-Id: I44f766e52f05c38a1b6c4a2e7942e3d6ecaae501
Ying Wang [Mon, 20 Oct 2014 20:44:30 +0000 (13:44 -0700)]
Update current.txt with generics to field types.
Bug:
17014855
Change-Id: I14672092f79374f6c5b2362bd3c2aaac84e0c2ae
Ricardo Cervera [Fri, 10 Oct 2014 20:37:16 +0000 (13:37 -0700)]
docs: Add SearchXonY to Common Intents
Change-Id: Idb68c0dc95dfd0a21a73df707a7a1f5b21c3ee5e
Jeff Hao [Mon, 27 Oct 2014 17:46:22 +0000 (17:46 +0000)]
Merge "Get UsageStats if no PackageUsage is available for boot dexopt filtering." into lmp-mr1-dev
Wink Saville [Mon, 27 Oct 2014 17:34:46 +0000 (17:34 +0000)]
Merge "Change subId to int from long" into lmp-mr1-dev
Eric Laurent [Fri, 10 Oct 2014 22:24:04 +0000 (15:24 -0700)]
audioservice: fix default stream volume
When the max stream volume is configurable by
a system property, the default stream volume should
be set accordingly.
Bug:
17507571.
Change-Id: I9d9378292fc7b9c9e32acc55a275cc0ae5b203d4
Evan Charlton [Mon, 27 Oct 2014 17:08:31 +0000 (17:08 +0000)]
Merge "Move telecom permission to the public API" into lmp-mr1-dev
Geoff Mendal [Mon, 27 Oct 2014 16:42:51 +0000 (16:42 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
automerge:
5a1a14a -s ours
* commit '
5a1a14a8174213edcd5f1d7f8fbc427122b25f99':
Import translations. DO NOT MERGE
Adrian Roos [Mon, 27 Oct 2014 15:55:36 +0000 (16:55 +0100)]
Fix NPE in FlashlightController
Bug:
18007548
Change-Id: Iecd1303feeb8062741752862312043ecd75cebbe
Geoff Mendal [Mon, 27 Oct 2014 15:55:18 +0000 (15:55 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Mon, 27 Oct 2014 15:53:05 +0000 (08:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4fc460aa64d5ea79e6ac16ce7b700b9a316819d1
Auto-generated-cl: translation import
Geoff Mendal [Mon, 27 Oct 2014 15:50:37 +0000 (15:50 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Mon, 27 Oct 2014 15:47:13 +0000 (08:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I05a75d27b0c7752e6afc0d51169e82f7547607df
Auto-generated-cl: translation import
Adrian Roos [Mon, 27 Oct 2014 14:32:19 +0000 (14:32 +0000)]
Merge "SampleTrustAgent: Exercise KeyguardManager.isKeyguardInTrustedState" into lmp-mr1-dev
Jorim Jaggi [Mon, 27 Oct 2014 14:32:13 +0000 (14:32 +0000)]
Merge "Fix padding between battery and system icons" into lmp-mr1-dev
Jorim Jaggi [Mon, 27 Oct 2014 14:31:53 +0000 (14:31 +0000)]
Merge "Fix system icon widths" into lmp-mr1-dev
Jorim Jaggi [Mon, 27 Oct 2014 14:31:32 +0000 (14:31 +0000)]
Merge "Add padding when both data icon and wifi icon is visible" into lmp-mr1-dev
George Mount [Mon, 27 Oct 2014 14:31:26 +0000 (14:31 +0000)]
Merge "Fix transition being canceled improperly." into lmp-mr1-dev
George Mount [Mon, 27 Oct 2014 14:30:32 +0000 (14:30 +0000)]
Merge "Add resizeClip attribute to ChangeBounds." into lmp-mr1-dev