OSDN Git Service
Geoff Mendal [Mon, 15 Dec 2014 14:36:56 +0000 (14:36 +0000)]
am
feb6c7f3: (-s ours) Import translations. DO NOT MERGE
* commit '
feb6c7f3d6d52648009ffb6fffa1f76d2f68fd21':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 15 Dec 2014 14:25:08 +0000 (06:25 -0800)]
Import translations. DO NOT MERGE
Change-Id: I70dc0646e4b8ea8b83dc1f7106067e278260bb3a
Auto-generated-cl: translation import
Prem Kumar [Sun, 14 Dec 2014 19:59:40 +0000 (19:59 +0000)]
am
9ef07ad2: Merge "make sure wificonfiguration scan cache doesnt grow unbounded Bug:
18703749" into lmp-mr1-dev
* commit '
9ef07ad2b63edd4094bd8f15ccf861c7b014b2b0':
make sure wificonfiguration scan cache doesnt grow unbounded Bug:
18703749
Prem Kumar [Sun, 14 Dec 2014 19:59:35 +0000 (19:59 +0000)]
am
6c2fa049: Merge "handle beacons reported with wrong RSSI value of 0 - Bug:
18654243" into lmp-mr1-dev
* commit '
6c2fa049aa342ed09c6987302d79a9447b99e5a4':
handle beacons reported with wrong RSSI value of 0 - Bug:
18654243
Prem Kumar [Sun, 14 Dec 2014 19:53:47 +0000 (19:53 +0000)]
Merge "make sure wificonfiguration scan cache doesnt grow unbounded Bug:
18703749" into lmp-mr1-dev
Prem Kumar [Sun, 14 Dec 2014 19:52:38 +0000 (19:52 +0000)]
Merge "handle beacons reported with wrong RSSI value of 0 - Bug:
18654243" into lmp-mr1-dev
Guang Zhu [Sun, 14 Dec 2014 03:39:07 +0000 (03:39 +0000)]
am
07bba9ab: Merge "shell based UI Automator source move" into lmp-mr1-dev
* commit '
07bba9abeeba77cdf491ecc3047d1fa34f280bbb':
shell based UI Automator source move
Guang Zhu [Sun, 14 Dec 2014 03:30:51 +0000 (03:30 +0000)]
Merge "shell based UI Automator source move" into lmp-mr1-dev
Jinsuk Kim [Sat, 13 Dec 2014 23:46:38 +0000 (23:46 +0000)]
am
a2bc055e: Merge "audioservice: Clear calling identity upon calling HdmiControlService" into lmp-mr1-dev
* commit '
a2bc055eeb240c1787e7ad9755ffd4f106bdbb63':
audioservice: Clear calling identity upon calling HdmiControlService
Jinsuk Kim [Sat, 13 Dec 2014 23:41:46 +0000 (23:41 +0000)]
Merge "audioservice: Clear calling identity upon calling HdmiControlService" into lmp-mr1-dev
Guang Zhu [Thu, 11 Dec 2014 23:12:30 +0000 (15:12 -0800)]
shell based UI Automator source move
frameworks/testing/uiautomator -> frameworks/base/cmds/uiautomator
(samples, utils sub folders exlcuded)
frameworks/testing/uiautomator/utils -> frameworks/base/tests/utils
no source files changed, only one line makefile update (for
UI Automator API check)
Bug:
18708851
Change-Id: I396bd386d3d55a52df18af183685daf80caa9f73
Christopher Tate [Sat, 13 Dec 2014 00:59:10 +0000 (00:59 +0000)]
am
90c0ae63: Merge "Check which file changed before requesting backup" into lmp-mr1-dev
* commit '
90c0ae637ab84d1954ce972f55c5d3e2d2b20586':
Check which file changed before requesting backup
Christopher Tate [Sat, 13 Dec 2014 00:52:08 +0000 (00:52 +0000)]
Merge "Check which file changed before requesting backup" into lmp-mr1-dev
Amith Yamasani [Wed, 10 Dec 2014 22:09:05 +0000 (14:09 -0800)]
Check which file changed before requesting backup
Make sure that the changed file is one of the wallpaper files
before requesting backup or informing listeners.
Bug:
18694053
Change-Id: Iaa8fe9d3c97634b3cc6a9ccd67c36cf394d17ca0
Tim Murray [Sat, 13 Dec 2014 00:10:46 +0000 (00:10 +0000)]
am
a6bfe6c9: Merge "Enable native tracking for RS contexts to improve GC behavior." into lmp-mr1-dev
* commit '
a6bfe6c957739fc172dd97ce4e26d8ec4ee4aa6f':
Enable native tracking for RS contexts to improve GC behavior.
Tim Murray [Sat, 13 Dec 2014 00:03:47 +0000 (00:03 +0000)]
Merge "Enable native tracking for RS contexts to improve GC behavior." into lmp-mr1-dev
Bart Sears [Fri, 12 Dec 2014 22:49:43 +0000 (22:49 +0000)]
am
1f28a6a5: resolved conflicts for merge of
08c72334 to lmp-mr1-dev
* commit '
1f28a6a571a9b4ff78d85e2b62a30d77ce986d7b':
Tune delivery and batching of alarms
Bart Sears [Fri, 12 Dec 2014 22:19:57 +0000 (14:19 -0800)]
resolved conflicts for merge of
08c72334 to lmp-mr1-dev
Used "-s ours" for the merge since this CL had been cherry-picked from
lmp-mr1-dev to lmp-dev so when auto-merging back, we want to keep what
is already in lmp-mr1-dev.
Alan Viverette [Fri, 12 Dec 2014 22:04:10 +0000 (22:04 +0000)]
am
7c3212b2: Merge "Propagate DrawableContainer state on mutate, fix ColorDrawable theming" into lmp-mr1-dev
* commit '
7c3212b2f4f2f4b5ee18f2db925db95ee420d489':
Propagate DrawableContainer state on mutate, fix ColorDrawable theming
Alan Viverette [Fri, 12 Dec 2014 22:04:04 +0000 (22:04 +0000)]
am
9a1b4c29: Merge "Move ripple to end state on jump when hardware exit is pending" into lmp-mr1-dev
* commit '
9a1b4c29672f7b7a8cfdeedfc2421854439c0af0':
Move ripple to end state on jump when hardware exit is pending
Alan Viverette [Fri, 12 Dec 2014 22:00:24 +0000 (22:00 +0000)]
Merge "Propagate DrawableContainer state on mutate, fix ColorDrawable theming" into lmp-mr1-dev
Alan Viverette [Fri, 12 Dec 2014 21:59:20 +0000 (21:59 +0000)]
Merge "Move ripple to end state on jump when hardware exit is pending" into lmp-mr1-dev
Alan Viverette [Fri, 12 Dec 2014 21:38:10 +0000 (13:38 -0800)]
Move ripple to end state on jump when hardware exit is pending
BUG:
18734676
Change-Id: Ie063e1eec0b4f28f936ea27822afacfd1b72a0e9
Tim Murray [Fri, 12 Dec 2014 19:34:48 +0000 (11:34 -0800)]
Enable native tracking for RS contexts to improve GC behavior.
This should prevent apps from leaking RS contexts as easily.
bug
18579193
Change-Id: I2d943ce4443ce7cb90ebdd3dd37d338eda6df3a2
Chong Zhang [Fri, 12 Dec 2014 20:54:49 +0000 (20:54 +0000)]
am
bb177db1: Merge "parse bitrate range for video/audio caps" into lmp-mr1-dev
* commit '
bb177db1fe39f0855f79c15195ae837d87479636':
parse bitrate range for video/audio caps
Svet Ganov [Fri, 12 Dec 2014 20:54:43 +0000 (20:54 +0000)]
am
14e3351a: Merge "Fix a NPE in AccessiiblityManagerService." into lmp-mr1-dev
* commit '
14e3351a1eae2b4fc8a12c9a4586f8ea7b87442c':
Fix a NPE in AccessiiblityManagerService.
Svet Ganov [Fri, 12 Dec 2014 20:54:38 +0000 (20:54 +0000)]
am
7486bc1f: Merge "Fix an edge case in computing click location in accessibility mode." into lmp-mr1-dev
* commit '
7486bc1f5a8156e9b586ebb9c32ced218e668652':
Fix an edge case in computing click location in accessibility mode.
Chong Zhang [Fri, 12 Dec 2014 20:49:34 +0000 (20:49 +0000)]
Merge "parse bitrate range for video/audio caps" into lmp-mr1-dev
Svet Ganov [Fri, 12 Dec 2014 20:48:59 +0000 (20:48 +0000)]
Merge "Fix a NPE in AccessiiblityManagerService." into lmp-mr1-dev
Svet Ganov [Fri, 12 Dec 2014 20:48:06 +0000 (20:48 +0000)]
Merge "Fix an edge case in computing click location in accessibility mode." into lmp-mr1-dev
Alan Viverette [Fri, 12 Dec 2014 20:34:15 +0000 (12:34 -0800)]
Propagate DrawableContainer state on mutate, fix ColorDrawable theming
BUG:
18542282
BUG:
18467568
Change-Id: Id1d75cfe47fde3206ab40e5360289e0cb2504402
Chong Zhang [Fri, 12 Dec 2014 19:13:20 +0000 (11:13 -0800)]
parse bitrate range for video/audio caps
Bug:
18684228
Change-Id: Ib5c3682bb1dfa338b99352ea040edcb99d86ef0b
Kenny Guy [Fri, 12 Dec 2014 18:50:15 +0000 (18:50 +0000)]
am
4357d4ea: Merge "Don\'t show last used and profile button at same time." into lmp-mr1-dev
* commit '
4357d4eabc375c392190cf2d1dfc3aeba9718ceb':
Don't show last used and profile button at same time.
Tim Kilbourn [Fri, 12 Dec 2014 18:50:10 +0000 (18:50 +0000)]
am
2636ccc1: Merge "Revert "Attempt to fix keyguard missing bug"" into lmp-mr1-dev
* commit '
2636ccc1857264a76db8ddaee600f06fadad3c36':
Revert "Attempt to fix keyguard missing bug"
Kenny Guy [Fri, 12 Dec 2014 18:46:20 +0000 (18:46 +0000)]
Merge "Don't show last used and profile button at same time." into lmp-mr1-dev
Tim Kilbourn [Fri, 12 Dec 2014 18:44:18 +0000 (18:44 +0000)]
Merge "Revert "Attempt to fix keyguard missing bug"" into lmp-mr1-dev
Adam Powell [Fri, 12 Dec 2014 18:43:38 +0000 (18:43 +0000)]
am
9a0799cf: Merge "Have ViewGroups without a parent clip child visible rects to bounds" into lmp-mr1-dev
* commit '
9a0799cf6b7289b8127ffcb22291f5baf21b4035':
Have ViewGroups without a parent clip child visible rects to bounds
Jason Monk [Fri, 12 Dec 2014 18:43:33 +0000 (18:43 +0000)]
am
a47f968d: Merge "Handle config changes in NetworkController" into lmp-mr1-dev
* commit '
a47f968d7e27560984d846bb62c7b40297c1579c':
Handle config changes in NetworkController
Jason Monk [Fri, 12 Dec 2014 18:43:28 +0000 (18:43 +0000)]
am
a6869700: Merge "Fix tests after inet changes in NetworkController" into lmp-mr1-dev
* commit '
a68697005137c2b5c5feb43b8cac078f7b75ec18':
Fix tests after inet changes in NetworkController
Adam Powell [Fri, 12 Dec 2014 18:37:31 +0000 (18:37 +0000)]
Merge "Have ViewGroups without a parent clip child visible rects to bounds" into lmp-mr1-dev
Jason Monk [Fri, 12 Dec 2014 18:36:37 +0000 (18:36 +0000)]
Merge "Handle config changes in NetworkController" into lmp-mr1-dev
Jason Monk [Fri, 12 Dec 2014 18:36:24 +0000 (18:36 +0000)]
Merge "Fix tests after inet changes in NetworkController" into lmp-mr1-dev
Tim Kilbourn [Fri, 12 Dec 2014 18:08:17 +0000 (10:08 -0800)]
Revert "Attempt to fix keyguard missing bug"
This reverts commit
a5faf2415d5760d2239f85271b889d655b5c271b.
It prevents the launcher from showing up on Android TV.
Bug:
18724479
Jinsuk Kim [Fri, 12 Dec 2014 17:16:28 +0000 (02:16 +0900)]
audioservice: Clear calling identity upon calling HdmiControlService
This makes sure that accessing the HdmiControlService via audio service
should be possible without the system permission.
Bug:
18730526
Change-Id: I05b364d8e38218eb75f3c08972a06bb2d71a982b
Esteban Talavera [Fri, 12 Dec 2014 17:08:46 +0000 (17:08 +0000)]
Merge "Take into account other profiles when deciding whether to show ResolverActivity" into lmp-mr1-dev
automerge:
c28fa2c
* commit '
c28fa2cdd4692faafc520972b71ddbac1feec4d3':
Take into account other profiles when deciding whether to show ResolverActivity
Kenny Guy [Fri, 12 Dec 2014 16:56:08 +0000 (16:56 +0000)]
Don't show last used and profile button at same time.
UI for ResolverActivity doesn't support last used
activity and work/personal profile button at the
same time. So if work/personal button is present
disable last used.
Bug:
18730438
Change-Id: I7ae7319bbdeb9bcaab9d6d03f97dea17d07c6d7f
Esteban Talavera [Fri, 12 Dec 2014 16:59:28 +0000 (16:59 +0000)]
Merge "Take into account other profiles when deciding whether to show ResolverActivity" into lmp-mr1-dev
Jason Monk [Fri, 12 Dec 2014 16:11:44 +0000 (11:11 -0500)]
Handle config changes in NetworkController
We need to remap or recalculate icons after a config change, so
configs based on mccmnc can update properly.
Bug:
18654943
Change-Id: I6a4c1debf9b266d486143b9869abb569bbc31aef
Jorim Jaggi [Fri, 12 Dec 2014 15:39:27 +0000 (15:39 +0000)]
am
8934e670: Merge "Limit item count in QS detail" into lmp-mr1-dev
* commit '
8934e67051a7c2598ad94699037701c4c6bf83ca':
Limit item count in QS detail
Jorim Jaggi [Fri, 12 Dec 2014 15:39:22 +0000 (15:39 +0000)]
am
d3cccec0: Merge "Fix low FPS when entering wifi/BT detail panel" into lmp-mr1-dev
* commit '
d3cccec08361effa5d0f47143ea8c521f49bad79':
Fix low FPS when entering wifi/BT detail panel
Jorim Jaggi [Fri, 12 Dec 2014 15:39:16 +0000 (15:39 +0000)]
am
ab60f285: Merge "Improve transition when going to Wifi/BT detail panel" into lmp-mr1-dev
* commit '
ab60f2855b0d2a96fe1610f42a83dc761c4c10e6':
Improve transition when going to Wifi/BT detail panel
Jorim Jaggi [Fri, 12 Dec 2014 15:32:55 +0000 (15:32 +0000)]
Merge "Limit item count in QS detail" into lmp-mr1-dev
Jorim Jaggi [Fri, 12 Dec 2014 15:32:28 +0000 (15:32 +0000)]
Merge "Fix low FPS when entering wifi/BT detail panel" into lmp-mr1-dev
Jorim Jaggi [Fri, 12 Dec 2014 15:32:16 +0000 (15:32 +0000)]
Merge "Improve transition when going to Wifi/BT detail panel" into lmp-mr1-dev
Jason Monk [Fri, 12 Dec 2014 15:23:12 +0000 (10:23 -0500)]
Fix tests after inet changes in NetworkController
Bug:
17460017
Change-Id: Iee9c4399f5ca4413f1449cfcf05d72a67b0adadc
Esteban Talavera [Thu, 11 Dec 2014 17:54:07 +0000 (17:54 +0000)]
Take into account other profiles when deciding whether to show ResolverActivity
Show ResolverActivity even if there is only one target
on the current profile that listens to that intent,
if other profiles can also handle it.
Also, fix crash while trying to access out of bounds
element on the list.
BUG:
18701336,
18713763
Change-Id: I3a5e9cc5c0eedb2792b8f6d8a5d4aa8ee9e1256b
Christopher Tate [Fri, 12 Dec 2014 13:33:53 +0000 (13:33 +0000)]
am
eb9d4fdf: am
a91ef1ec: Properly recognize repeating wakeup alarms automerge:
8965a8d
* commit '
eb9d4fdf4623fe23f0f224b5ae2d68cd4c714c7f':
Properly recognize repeating wakeup alarms
Christopher Tate [Fri, 12 Dec 2014 13:24:06 +0000 (13:24 +0000)]
am
a91ef1ec: Properly recognize repeating wakeup alarms automerge:
8965a8d
* commit '
a91ef1ec04affdf98eb89f11b67fdbae72acb8dd':
Properly recognize repeating wakeup alarms
Bart Sears [Fri, 12 Dec 2014 13:15:38 +0000 (13:15 +0000)]
Merge "Tune delivery and batching of alarms" into lmp-dev
automerge:
3ec6a91
* commit '
3ec6a91204ffac6e81eaad7ca29e817e9502f856':
Tune delivery and batching of alarms
Christopher Tate [Fri, 12 Dec 2014 13:14:30 +0000 (13:14 +0000)]
Properly recognize repeating wakeup alarms
automerge:
8965a8d
* commit '
8965a8da5513cf31a313ecdac3506718c2813932':
Properly recognize repeating wakeup alarms
Svet Ganov [Fri, 12 Dec 2014 06:59:08 +0000 (22:59 -0800)]
Fix a NPE in AccessiiblityManagerService.
It is possible that the accessibility windows list is null which
is treated as if there is no window information. The getWindows
method was accessing properties of the windows filed witgout a
null check.
bug:
18522998
Change-Id: Ieefe678d3da3d6e8f96c0e4bedac0c55975621fa
Svet Ganov [Fri, 12 Dec 2014 06:33:45 +0000 (22:33 -0800)]
Fix an edge case in computing click location in accessibility mode.
In accessibility mode to click a view we computed a point where to send
down and up touch events. The logic that computes where to send the
events was not clipping the bounds of the child to these of the parent.
As a result we wrongly computed we can send the events in a location
of the child that is outside of its parent, thus the click having no
effect or clicking the wrong thing.
bug:
18672945
Change-Id: If9c452e7e5b196f699db33d37dbc6775d5d1622a
Wink Saville [Fri, 12 Dec 2014 04:37:40 +0000 (04:37 +0000)]
am
6e04a7b6: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev
* commit '
6e04a7b65488656c4cb72d99d285050d56068112':
Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
Wink Saville [Fri, 12 Dec 2014 04:22:38 +0000 (04:22 +0000)]
Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev
Bart Sears [Fri, 12 Dec 2014 01:52:29 +0000 (01:52 +0000)]
Merge "Tune delivery and batching of alarms" into lmp-dev
Iliyan Malchev [Fri, 12 Dec 2014 00:34:35 +0000 (00:34 +0000)]
am
45838de9: fix Uss accounting in getPssPid()
* commit '
45838de942b87150fc3b03a8b943841a8647fd81':
fix Uss accounting in getPssPid()
Iliyan Malchev [Thu, 11 Dec 2014 22:29:36 +0000 (14:29 -0800)]
fix Uss accounting in getPssPid()
Change-Id: I0d1dc81d127afbf3a7d7b4b86865ccb0e8bd7d4c
Signed-off-by: Iliyan Malchev <malchev@google.com>
Jim Miller [Thu, 11 Dec 2014 23:41:03 +0000 (23:41 +0000)]
am
4841a787: Merge "Attempt to fix keyguard missing bug" into lmp-mr1-dev
* commit '
4841a787b3380ba045a465e347668729b19f3d79':
Attempt to fix keyguard missing bug
Jim Miller [Thu, 11 Dec 2014 23:33:09 +0000 (23:33 +0000)]
Merge "Attempt to fix keyguard missing bug" into lmp-mr1-dev
Christopher Tate [Fri, 5 Dec 2014 02:27:16 +0000 (18:27 -0800)]
Tune delivery and batching of alarms
cherry-pick from lmp-mr1-dev
* Inexact alarms no longer coalesce with exact alarms. The motivation here
is that exact alarms are far more likely to be wall-clock aligned, and in
general pulling all alarms toward wall-clock alignment is a bad idea.
* Wakeup times are now fuzzed within the target batch's allowed window
rather than being hard pinned at the start of the window.
Bug
18631821
Change-Id: Iefaf34eee3f2a6546abefc27e177ee2fdcff935f
(cherry picked from commit
81f9882b5aadd6a2289c9f521a06a7af5f35ebf0)
Christopher Tate [Tue, 2 Dec 2014 19:48:53 +0000 (11:48 -0800)]
Properly recognize repeating wakeup alarms
cherry-pick from lmp-mr1-dev
The code in place was inappropriately treating all recurring alarms
as non-wakeup for purposes of deferral. Worse, it was overriding the
"this deliverable batch of alarms includes a wakeup alarm" bookkeeping,
so could potentially cause inappropriate deferral of even standalone
wakeup alarms.
Bug
18591317
Change-Id: I2a62ed4badcaeb549c1ac4f086014aa829e45427
(cherry picked from commit
864d42eb96a9127b7d2f10ad11e709c24b4b4304)
John Reck [Thu, 11 Dec 2014 22:49:52 +0000 (22:49 +0000)]
am
b9a4d15d: Merge "Force-flush state sync on texid change" into lmp-mr1-dev
* commit '
b9a4d15d0942a55c7dc32a471ee40890986e3fab':
Force-flush state sync on texid change
Chris Craik [Thu, 11 Dec 2014 22:49:46 +0000 (22:49 +0000)]
am
63c7b246: Merge "Correct layer size formatting in trace" into lmp-mr1-dev
* commit '
63c7b24645d94c92dc6dc32d57c23b5167950c8b':
Correct layer size formatting in trace
John Reck [Thu, 11 Dec 2014 22:44:18 +0000 (22:44 +0000)]
Merge "Force-flush state sync on texid change" into lmp-mr1-dev
Chris Craik [Thu, 11 Dec 2014 22:43:16 +0000 (22:43 +0000)]
Merge "Correct layer size formatting in trace" into lmp-mr1-dev
Craig Mautner [Thu, 11 Dec 2014 22:29:58 +0000 (22:29 +0000)]
am
72b047c6: Merge "Don\'t apply animations to windows that are showing" into lmp-mr1-dev
* commit '
72b047c6c37ddf860be15b159b9a143be36d7425':
Don't apply animations to windows that are showing
David Friedman [Thu, 11 Dec 2014 22:29:53 +0000 (22:29 +0000)]
am
e84bf9fd: am
d0d76540: am
c82392df: am
1ab615b3: Merge "Adds link to related video." into lmp-docs
* commit '
e84bf9fddce69f2cc6b9e5f4274419a4122476a2':
Adds link to related video.
Chris Craik [Thu, 11 Dec 2014 22:29:51 +0000 (14:29 -0800)]
Correct layer size formatting in trace
bug:
18722704
Change-Id: Icef9aaa62633b2d86ad250f43d4c8fa5cc0b6842
Craig Mautner [Thu, 11 Dec 2014 22:27:52 +0000 (22:27 +0000)]
Merge "Don't apply animations to windows that are showing" into lmp-mr1-dev
John Reck [Thu, 11 Dec 2014 22:27:39 +0000 (14:27 -0800)]
Force-flush state sync on texid change
Bug:
18718646
Caused because the Texture object thought the GLES texture
was in a different state than it was as it persists across
EGL/GL contexts. Fix this by force-flushing the default
values when the texid has changed.
Change-Id: I264bac9a2beb08df8e2ba8a85ad15f0dd1fce22a
David Friedman [Thu, 11 Dec 2014 22:21:16 +0000 (22:21 +0000)]
am
d0d76540: am
c82392df: am
1ab615b3: Merge "Adds link to related video." into lmp-docs
* commit '
d0d76540ae937d6773793ba053e81ee3667d0ba6':
Adds link to related video.
Alan Viverette [Thu, 11 Dec 2014 22:19:07 +0000 (22:19 +0000)]
am
ff441883: Merge "Improve time picker accessibility" into lmp-mr1-dev
* commit '
ff44188309fca037892d0ded64cfee04a3a71c42':
Improve time picker accessibility
Alan Viverette [Thu, 11 Dec 2014 22:11:54 +0000 (22:11 +0000)]
Merge "Improve time picker accessibility" into lmp-mr1-dev
David Friedman [Thu, 11 Dec 2014 22:10:48 +0000 (22:10 +0000)]
am
c82392df: am
1ab615b3: Merge "Adds link to related video." into lmp-docs
* commit '
c82392df7caa12836d97650c7528f216d3c2b76f':
Adds link to related video.
David Friedman [Thu, 11 Dec 2014 22:03:42 +0000 (22:03 +0000)]
am
1ab615b3: Merge "Adds link to related video." into lmp-docs
* commit '
1ab615b3e6a7ae820fde4ba067f76dff635f3639':
Adds link to related video.
David Friedman [Thu, 11 Dec 2014 21:55:23 +0000 (21:55 +0000)]
Merge "Adds link to related video." into lmp-docs
Wink Saville [Thu, 11 Dec 2014 21:37:50 +0000 (13:37 -0800)]
Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
Rename isValidSubId to isValidSubscriptionId.
Bug:
18668873
Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44
Winson Chung [Thu, 11 Dec 2014 21:27:54 +0000 (21:27 +0000)]
am
47d9a58c: Merge "Fixing issue with old thumbnails on first launch of app. (Bug
18718114)" into lmp-mr1-dev
* commit '
47d9a58ce15007f79bc094d9b1599e41d51670a3':
Fixing issue with old thumbnails on first launch of app. (Bug
18718114)
Winson Chung [Thu, 11 Dec 2014 21:20:40 +0000 (21:20 +0000)]
Merge "Fixing issue with old thumbnails on first launch of app. (Bug
18718114)" into lmp-mr1-dev
Joe Fernandez [Thu, 11 Dec 2014 21:03:11 +0000 (21:03 +0000)]
am
81779694: am
c9014b6d: am
ea500a3a: am
0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs
* commit '
817796940bf79942ccd950cec47815039a2aa15e':
docs: studio basics haxm updates
Ricardo Cervera [Thu, 11 Dec 2014 21:03:06 +0000 (21:03 +0000)]
am
af7070e6: am
64d97cb2: am
6621a4f6: am
9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs
* commit '
af7070e6f0bb2b035b1d2565fdd50b6bde210864':
docs: Fixes to watch faces docs.
Rich Slogar [Thu, 11 Dec 2014 21:02:44 +0000 (21:02 +0000)]
am
0564cee3: am
b490f297: am
5c853c26: am
d35216ad: Merge "docs: studio bundle update" into lmp-docs
* commit '
0564cee3c7537c916c74e560e2160b0f0657a9eb':
docs: studio bundle update
Joe Fernandez [Thu, 11 Dec 2014 21:02:37 +0000 (21:02 +0000)]
am
07877955: am
5c518b7f: am
b32987ec: am
c3daed96: Merge "docs: platform updates for api 21" into lmp-docs
* commit '
07877955bef2132ea5e8d02662a7f0ca1aad5f7d':
docs: platform updates for api 21
Joe Fernandez [Thu, 11 Dec 2014 21:02:32 +0000 (21:02 +0000)]
am
e3bac3bc: am
b64545c8: am
378c71a3: am
235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs
* commit '
e3bac3bc8f015a1ee8238fef7ca155fb432beb51':
docs: sdk tools 24.0.1 revisions
Andrew Solovay [Thu, 11 Dec 2014 21:02:26 +0000 (21:02 +0000)]
am
13e0a650: am
a97053fd: am
f43c057c: am
c7ad6e91: docs: Added info about managed profiles to "Android 5.0 Changes"
* commit '
13e0a6505fd049a8df47aa8fa01b7c8c3120dea1':
docs: Added info about managed profiles to "Android 5.0 Changes"
Joe Fernandez [Thu, 11 Dec 2014 20:55:53 +0000 (20:55 +0000)]
am
c9014b6d: am
ea500a3a: am
0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs
* commit '
c9014b6d59cae3602027a5ea373d436a7e78b71c':
docs: studio basics haxm updates
Ricardo Cervera [Thu, 11 Dec 2014 20:55:49 +0000 (20:55 +0000)]
am
64d97cb2: am
6621a4f6: am
9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs
* commit '
64d97cb2ad6bfd10511067f178ba8a1ccf9ba452':
docs: Fixes to watch faces docs.
Rich Slogar [Thu, 11 Dec 2014 20:55:45 +0000 (20:55 +0000)]
am
b490f297: am
5c853c26: am
d35216ad: Merge "docs: studio bundle update" into lmp-docs
* commit '
b490f297101bcf31f56278d21d5f56a5e5998a58':
docs: studio bundle update
Joe Fernandez [Thu, 11 Dec 2014 20:55:35 +0000 (20:55 +0000)]
am
5c518b7f: am
b32987ec: am
c3daed96: Merge "docs: platform updates for api 21" into lmp-docs
* commit '
5c518b7f01345a414cd260db7762bdb0aa73b55b':
docs: platform updates for api 21
Joe Fernandez [Thu, 11 Dec 2014 20:55:29 +0000 (20:55 +0000)]
am
b64545c8: am
378c71a3: am
235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs
* commit '
b64545c83a526d17ccbce2d110a06f3789dd4ad8':
docs: sdk tools 24.0.1 revisions