OSDN Git Service
Mady Mellor [Fri, 15 May 2015 17:56:48 +0000 (17:56 +0000)]
Merge "Fix difficulty grabbing handles for small selections" into mnc-dev
Yohei Yukawa [Fri, 15 May 2015 17:40:39 +0000 (17:40 +0000)]
Merge "Revert "Fix IMMS#mInputShown state inconsistency."" into mnc-dev
Yohei Yukawa [Fri, 15 May 2015 17:30:12 +0000 (10:30 -0700)]
Revert "Fix IMMS#mInputShown state inconsistency."
This reverts commit
8d4a9117fbd0aaf03b8486ef920c73894a12cfcd.
Because of a regression Bug
21161785.
Bug:
21161785
Bug:
18722991
Bug:
20763994
Bug:
20764441
Bug:
20926844
Change-Id: If58612eda08764be0226832c0a73f03683889cdb
Dirk Dougherty [Fri, 15 May 2015 16:46:24 +0000 (16:46 +0000)]
am
7414f97a: am
efd254b2: Doc change: fix urls, remove obsolete image.
* commit '
7414f97a04658858201760c3a60a9d8fa95042fa':
Doc change: fix urls, remove obsolete image.
Dirk Dougherty [Fri, 15 May 2015 16:46:18 +0000 (16:46 +0000)]
am
3519ddfe: am
de401c82: Doc change: More changes to distribute files, Google Services page update.
* commit '
3519ddfe07de5847332937c4a0ba29c0378fe26a':
Doc change: More changes to distribute files, Google Services page update.
Alan Viverette [Fri, 15 May 2015 16:44:21 +0000 (16:44 +0000)]
Merge "Update button visibility as a final step in DayPickerView construction" into mnc-dev
Alan Viverette [Fri, 15 May 2015 16:43:00 +0000 (16:43 +0000)]
Merge "Revert "Strip PNG metadata"" into mnc-dev
Alan Viverette [Fri, 15 May 2015 16:41:26 +0000 (16:41 +0000)]
Revert "Strip PNG metadata"
Removing the color profiles significantly changed the
appearance of some assets.
This reverts commit
fe1ca2c535816bf7528b8b77fb5c24f9db324671.
Change-Id: I60d9b645eda927b0fc5adc8b2bd0902fb536208a
Svet Ganov [Fri, 15 May 2015 16:34:53 +0000 (16:34 +0000)]
Merge "Fix easter egg setting validator to accept valid values" into mnc-dev
Svet Ganov [Fri, 15 May 2015 16:32:55 +0000 (09:32 -0700)]
Fix easter egg setting validator to accept valid values
bug:
21188928
Change-Id: I5f6d445aad7231a907026c552c87f9cdfe024d32
Zhijun He [Fri, 15 May 2015 16:03:30 +0000 (16:03 +0000)]
Merge "Camera2: get ride of sceneModeOverrides in API doc" into mnc-dev
Paul McLean [Fri, 15 May 2015 14:35:48 +0000 (14:35 +0000)]
Merge "Change AudioDevicesInfo.getFormats() to getEncodings()." into mnc-dev
Tor Norbye [Fri, 15 May 2015 14:21:12 +0000 (14:21 +0000)]
Merge "Add bluetooth permission annotations" into mnc-dev
George Mount [Fri, 15 May 2015 14:08:17 +0000 (14:08 +0000)]
Merge "Remove hidden/deleted APIs." into mnc-dev
Dan Sandler [Wed, 6 May 2015 19:18:49 +0000 (15:18 -0400)]
Icon support comes to Notification.
And you may ask yourself: what is that beautiful icon?
And you may ask yourself: where does that API go to?
And you may ask yourself: is it a resource? is it a Bitmap?
And you may say to yourself: my god, what have I done
(This patch fixes a number of bugs in the initial
implementation, but other than that, it's the same as it
ever was.)
Bug:
18568715
Bug:
21141842
Change-Id: I1d3f9427abd7f0bb57e533fcfac708851ff644b6
Dan Sandler [Fri, 15 May 2015 04:39:41 +0000 (04:39 +0000)]
Merge "Use Context instead of Resources in Icon.createWithResource." into mnc-dev
Matthew Williams [Fri, 15 May 2015 03:51:57 +0000 (03:51 +0000)]
Merge "Fix bug with jobservice context giving wrong value" into mnc-dev
Matthew Williams [Fri, 15 May 2015 00:47:33 +0000 (17:47 -0700)]
Fix bug with jobservice context giving wrong value
BUG:
20614145
Change-Id: Ibd555732e03646d6d59e6d0effa9f92ec70ca3c4
Lorenzo Colitti [Fri, 15 May 2015 03:37:22 +0000 (03:37 +0000)]
Merge "Statically import NetworkCapabilities constants for brevity." into mnc-dev
Dirk Dougherty [Fri, 15 May 2015 03:22:53 +0000 (03:22 +0000)]
am
efd254b2: Doc change: fix urls, remove obsolete image.
* commit '
efd254b2f9246d4c259be7885ef344be745bc8bc':
Doc change: fix urls, remove obsolete image.
Dirk Dougherty [Fri, 15 May 2015 03:17:37 +0000 (03:17 +0000)]
am
de401c82: Doc change: More changes to distribute files, Google Services page update.
* commit '
de401c82f58a9465593391fede942fe6ffd22ef1':
Doc change: More changes to distribute files, Google Services page update.
Dirk Dougherty [Fri, 15 May 2015 03:14:34 +0000 (20:14 -0700)]
Doc change: fix urls, remove obsolete image.
Change-Id: I61ec972b1df2c3211da6e21ee4e4ec3319d0d02b
Dirk Dougherty [Sat, 9 May 2015 19:10:56 +0000 (12:10 -0700)]
Doc change: More changes to distribute files, Google Services page update.
Change-Id: I047ff9165c5844075561b31e42f8127d8819aeb0
Jae Seo [Fri, 15 May 2015 02:44:21 +0000 (02:44 +0000)]
Merge "TIF: Remove incorrect audio mode check" into mnc-dev
Jae Seo [Fri, 15 May 2015 02:16:30 +0000 (19:16 -0700)]
TIF: Remove incorrect audio mode check
Bug:
21170680
Change-Id: If50181294d7b2977d8e0735ae4d118943e0aad60
Christopher Tate [Fri, 15 May 2015 01:50:38 +0000 (01:50 +0000)]
Merge "fullBackupContent isn't public API" into mnc-dev
Ruben Brunk [Fri, 15 May 2015 01:45:18 +0000 (01:45 +0000)]
Merge "camera2: Fix work-profile eviction handling." into mnc-dev
Sailesh Nepal [Fri, 15 May 2015 01:40:09 +0000 (01:40 +0000)]
Merge "Fix in-call UI crash on Nova devcies (framework/base)" into mnc-dev
Ruben Brunk [Fri, 1 May 2015 00:46:30 +0000 (17:46 -0700)]
camera2: Fix work-profile eviction handling.
Bug:
20124384
Change-Id: I6fb82dbfd5f98746ed4befed81a583e3709bfee8
Yorke Lee [Fri, 15 May 2015 01:39:03 +0000 (01:39 +0000)]
Merge "Fix missing break in Icon class" into mnc-dev
Sailesh Nepal [Fri, 15 May 2015 01:28:10 +0000 (18:28 -0700)]
Fix in-call UI crash on Nova devcies (framework/base)
If a status hint icon wasn't set we'd crash.
Fix was to set StatusHitns.mIcon to null if the icon resource ID'
was 0.
BUG:
21168985
Change-Id: I33c06169f9e184b063e6fd10f77408bc262ea3c8
Yorke Lee [Fri, 15 May 2015 01:22:02 +0000 (18:22 -0700)]
Fix missing break in Icon class
This causes RuntimeExceptions to fall through to the next
case statement.
Bug:
21168985
Change-Id: Ie69610b22c6caf9f6536ebd48673067880cb75a2
Sailesh Nepal [Fri, 15 May 2015 00:55:39 +0000 (00:55 +0000)]
Merge "Fix post dial for remote connections" into mnc-dev
Sailesh Nepal [Fri, 15 May 2015 00:39:41 +0000 (17:39 -0700)]
Fix post dial for remote connections
Use the correct callback (onPostDialChar instead of onPostDialWait).
This fixes a bug where every remote call would prompt the user
to send tones after the call became active.
BUG:
21004101
Change-Id: I1656a4266d0028ef29494a3cee169180267e16cd
Doris Liu [Fri, 15 May 2015 00:28:32 +0000 (00:28 +0000)]
Merge "Start AnimationDrawable from the zeroth frame." into mnc-dev
Doris Liu [Thu, 14 May 2015 22:12:23 +0000 (15:12 -0700)]
Start AnimationDrawable from the zeroth frame.
This CL fixes the issue where when start is called, we run the next frame
of the animation drawable while mCurFrame is already set to 0. The result
is that the first frame of the AnimationDrawable is then skipped.
Bug:
21168854
Change-Id: I2b77ae017d3debd0f8cfec81ea86d1120e78bb55
Tor Norbye [Fri, 24 Apr 2015 00:10:21 +0000 (17:10 -0700)]
Add bluetooth permission annotations
Change-Id: I5bc86f8ec6ea5c873f1e14dab0e0c47c5c9df7f7
Deepanshu Gupta [Fri, 15 May 2015 00:01:51 +0000 (00:01 +0000)]
Merge "Fix build: udpate parser factory method" into mnc-dev
Deepanshu Gupta [Fri, 15 May 2015 00:00:50 +0000 (17:00 -0700)]
Fix build: udpate parser factory method
Change-Id: I78ad55bc924427b44451ec32fbd1032d6cd77544
John Reck [Thu, 14 May 2015 23:27:47 +0000 (23:27 +0000)]
Merge "Check for setting to already set" into mnc-dev
Svet Ganov [Thu, 14 May 2015 23:25:09 +0000 (23:25 +0000)]
Merge "Fix grant/revoke to act on owner by default and log invalid user id." into mnc-dev
Svet Ganov [Thu, 14 May 2015 23:18:05 +0000 (16:18 -0700)]
Fix grant/revoke to act on owner by default and log invalid user id.
bug:
21163229
Change-Id: I66d0cc130b37b5752ed06afc73259ed41bfb7830
Jorim Jaggi [Thu, 14 May 2015 23:15:23 +0000 (23:15 +0000)]
Merge "Adjust lockscreen style to spec" into mnc-dev
Jorim Jaggi [Thu, 14 May 2015 00:39:18 +0000 (17:39 -0700)]
Fix brightness mirror positioning.
Bug:
20884993
Change-Id: Iba75c2dd7aca9b7ac446cb6a278085af4e150b95
John Reck [Thu, 14 May 2015 22:47:03 +0000 (15:47 -0700)]
Check for setting to already set
Bug:
20105644
Change-Id: Ia79d2ae5c725c139d2b7c423a899be625cb8f14f
Jorim Jaggi [Thu, 14 May 2015 21:13:20 +0000 (14:13 -0700)]
Adjust lockscreen style to spec
Bug:
21111048
Change-Id: Ibdecaf01224ef45a53b4981d8b79d27034a3df45
Deepanshu Gupta [Thu, 14 May 2015 22:57:02 +0000 (22:57 +0000)]
Merge "Don't keep LayoutlibCallback reference." into mnc-dev
Jinsuk Kim [Thu, 14 May 2015 22:47:05 +0000 (22:47 +0000)]
Merge "CEC: Remove obsolete TODOs" into mnc-dev
Deepanshu Gupta [Thu, 14 May 2015 22:37:29 +0000 (15:37 -0700)]
Don't keep LayoutlibCallback reference.
Switch to the newer API that enables keeping a reference only to the
ParserFactory which is a much leaner object as compared to
LayoutlibCallback.
Change-Id: I9b7afd93226db23786a00b2951cbf5ae5b8f3e5f
Zhijun He [Thu, 14 May 2015 22:36:04 +0000 (15:36 -0700)]
Camera2: get ride of sceneModeOverrides in API doc
sceneModeOverrides isn't public API.
Bug:
20152738
Change-Id: I4024b152c47c1d0184971539c99a2f1cc1b1c1a0
Miao Wang [Thu, 14 May 2015 22:22:01 +0000 (22:22 +0000)]
Merge "[RenderScript] Add dummy getMinorID to maintain compatible with old RS compat lib." into mnc-dev
Jorim Jaggi [Thu, 14 May 2015 00:50:26 +0000 (17:50 -0700)]
Fix closing state
Bug:
20940663
Change-Id: I34e2bf4fb3ba9f9ad15e634c4a09883f57b446b2
Deepanshu Gupta [Thu, 14 May 2015 22:18:32 +0000 (22:18 +0000)]
Merge "Move couple of intellij libraries to project level." into mnc-dev
Christopher Tate [Thu, 14 May 2015 22:16:32 +0000 (22:16 +0000)]
Merge "Clarify docs for BackupTransport.initializeDevice()" into mnc-dev
Deepanshu Gupta [Thu, 14 May 2015 22:12:57 +0000 (15:12 -0700)]
Move couple of intellij libraries to project level.
Move framework and layoutlib api libraries back to being project
libraries so that other modules can depend on it. This enables custom
widget libraries project to merge through cleanly.
Change-Id: I4f00d6fb378a80662f32491a2b0061d6bf61899f
Yin-Chia Yeh [Thu, 14 May 2015 22:12:29 +0000 (22:12 +0000)]
Merge "Camera: tonemap linkify update" into mnc-dev
Miao Wang [Thu, 14 May 2015 21:53:30 +0000 (14:53 -0700)]
[RenderScript] Add dummy getMinorID to maintain compatible with old RS
compat lib.
bug:
21132592
Change-Id: I375f188dfbd33367a9589533aa51b182fda8bc21
Christopher Tate [Thu, 14 May 2015 20:20:10 +0000 (13:20 -0700)]
fullBackupContent isn't public API
Bug
21090205
Change-Id: I1b468f1e7bf86455576760e4a1d1ea9657074a9e
Paul McLean [Thu, 14 May 2015 21:57:08 +0000 (14:57 -0700)]
Change AudioDevicesInfo.getFormats() to getEncodings().
Change-Id: Id5115853744cd945bee5fee2601d9febc953208f
Zhijun He [Thu, 14 May 2015 21:46:36 +0000 (21:46 +0000)]
Merge "ImageReader: Image getFormat should return the Image buffer format" into mnc-dev
Zhijun He [Thu, 14 May 2015 21:43:59 +0000 (21:43 +0000)]
Merge "Image/Reader/Writer: address API review comments" into mnc-dev
Jinsuk Kim [Thu, 14 May 2015 21:28:47 +0000 (06:28 +0900)]
CEC: Remove obsolete TODOs
Removed legacy TODOs and the associated hack to enable CEC service
for buggy partner low-level implementation.
Bug:
21153475
Change-Id: I105f77389dd5c604336f86ce375016fa87c86759
Zhijun He [Wed, 13 May 2015 19:11:47 +0000 (12:11 -0700)]
Image/Reader/Writer: address API review comments
* Remove isOpaque methods
* Removew ImageReader#newOpaqueInstance
* Rename Writer listener and callback
* Clarify the timestamp spec
* Fix a bug in ImageUtils
Bug:
21044520
Change-Id: Ifb85ef25e4d152c2a445b3369c1e16dc1bc5220c
Joe LaPenna [Thu, 14 May 2015 21:34:16 +0000 (21:34 +0000)]
am
08bea4c9: (-s ours) am
627f2681: Merge "Wait for KEY_SLEEP UP event before calling goToSleep()" into lmp-mr1-modular-dev
* commit '
08bea4c90dce2991ab518bd167a29df8b23f7d1b':
Wait for KEY_SLEEP UP event before calling goToSleep()
Chong Zhang [Thu, 14 May 2015 21:29:50 +0000 (21:29 +0000)]
Merge "MediaDataSource: address API council comments" into mnc-dev
Alan Viverette [Thu, 14 May 2015 21:24:36 +0000 (14:24 -0700)]
Update button visibility as a final step in DayPickerView construction
Previously it was only updated when the page was turned, but that listener
isn't called until the user turns the page.
Bug:
20701637
Change-Id: I06faf59660cda0e19d57766f4afd141e4a389b18
Chong Zhang [Thu, 14 May 2015 17:08:08 +0000 (10:08 -0700)]
MediaDataSource: address API council comments
- throw IOExecption on fatal errors
- add offset argument to readAt
- and fix a crash in MediaExtractor
bug:
21045118
bug:
21163225
Change-Id: I3c0ff42e539868b9374a4f1f3a9852143f68ba68
Lajos Molnar [Thu, 14 May 2015 21:17:27 +0000 (21:17 +0000)]
Merge "media: remove setPlaybackRate from MediaPlayer and MediSync" into mnc-dev
Lajos Molnar [Thu, 14 May 2015 21:17:27 +0000 (21:17 +0000)]
Merge "media: change final fields to accessors in MediaTimestamp" into mnc-dev
George Mount [Fri, 8 May 2015 21:21:20 +0000 (14:21 -0700)]
Remove hidden/deleted APIs.
Change-Id: Iabeaac2c9b485f1f25fb2fcc3193610b0d6478c4
Joe LaPenna [Thu, 14 May 2015 21:07:54 +0000 (21:07 +0000)]
am
627f2681: Merge "Wait for KEY_SLEEP UP event before calling goToSleep()" into lmp-mr1-modular-dev
* commit '
627f26817f752e0e1beb4185e778edc4501b4aa6':
Wait for KEY_SLEEP UP event before calling goToSleep()
Xiaohui Chen [Thu, 14 May 2015 21:05:35 +0000 (21:05 +0000)]
Merge "wallpaper: avoid exception when user is not initialized" into mnc-dev
Joe LaPenna [Thu, 14 May 2015 20:55:08 +0000 (20:55 +0000)]
Merge "Wait for KEY_SLEEP UP event before calling goToSleep()" into lmp-mr1-modular-dev
Chien-Yu Chen [Thu, 14 May 2015 20:46:35 +0000 (20:46 +0000)]
Merge "Camera2: Fix reprocessing API naming and docs" into mnc-dev
Mikhail Naganov [Thu, 14 May 2015 20:43:04 +0000 (20:43 +0000)]
Merge "Tiny fix after updating the error reporting API" into mnc-dev
Joseph Wen [Thu, 14 May 2015 20:31:06 +0000 (20:31 +0000)]
Merge "Change the location of Brandmaster statement file." into mnc-dev
Mikhail Naganov [Thu, 14 May 2015 20:30:13 +0000 (13:30 -0700)]
Tiny fix after updating the error reporting API
Temporarily make WebResourceError.getDescription() non-abstract
so the current version of WebView doesn't crash on it.
Bug:
20064008,
21063767
Change-Id: I15a1abb5df76263006d14eb589fe0076d5aac582
Alan Viverette [Thu, 14 May 2015 20:20:47 +0000 (20:20 +0000)]
Merge "Avoid sealed check when unparceling AccessibilityNodeInfo" into mnc-dev
Jason Sams [Thu, 14 May 2015 20:15:39 +0000 (20:15 +0000)]
Merge "Fix issues found during CTS testing of FP16" into mnc-dev
Joseph Wen [Thu, 14 May 2015 18:13:11 +0000 (14:13 -0400)]
Change the location of Brandmaster statement file.
Change the location of statement file for web asset
from /.well-known/associations.json to /.well-known/statements.json.
BUG=
21153250
Change-Id: Ie8538b852d62c54254c895e0abadc7f502ea2181
Craig Mautner [Thu, 14 May 2015 20:03:03 +0000 (20:03 +0000)]
Merge "Lock top task if whitelisting arrives after start." into mnc-dev
Christopher Tate [Thu, 14 May 2015 19:54:24 +0000 (12:54 -0700)]
Clarify docs for BackupTransport.initializeDevice()
Explicitly call out that even if the backend is in an undefined state
(such as no authenticated account, so there is by definition no work
that can be done here), the transport should return TRANSPORT_OK in
response to initializeDevice(). Error returns from that method must
only be used to indicate that the initialize should be *retried*.
Bug
21136957
Change-Id: I41ad115b92c16092b4d931d9c554a44b77945359
Craig Mautner [Wed, 13 May 2015 20:06:11 +0000 (13:06 -0700)]
Lock top task if whitelisting arrives after start.
If the DevicePolicyManagerService updates the whitelist after a task
in the whitelist has started then the task won't have started locked.
When the updated whitelist arrives this change automatically locks the
topmost task if it is in the whitelist.
Also more locktask debugging.
Fixes bug
21031298.
Change-Id: I2494af6f2819ca91bc01abc5decb3d1adc088226
Wale Ogunwale [Thu, 14 May 2015 19:29:34 +0000 (19:29 +0000)]
Merge "Revert "Update IME focus when the active view is losing the focus."" into mnc-dev
Alan Viverette [Thu, 14 May 2015 19:26:49 +0000 (12:26 -0700)]
Avoid sealed check when unparceling AccessibilityNodeInfo
Previously the unparceling code relied on addAction(), which would
incorrectly crash if the node was sealed.
Bug:
21135077
Change-Id: I773ac27b2dee501ffea0a0587536a192af402c32
Wale Ogunwale [Thu, 14 May 2015 19:20:53 +0000 (12:20 -0700)]
Revert "Update IME focus when the active view is losing the focus."
This reverts commit
97c381304207013fd95c7806df4dcca0c69006c0.
This causes issue with the right IME window getting focus.
Bug:
21144633
Change-Id: I4c75b6e7dd87c10f008444d2059164b52a8f4335
Lajos Molnar [Wed, 13 May 2015 22:30:58 +0000 (15:30 -0700)]
media: change final fields to accessors in MediaTimestamp
Bug:
20887706
Change-Id: Iea0acdeec9dd7e818c80454af639f9480ff6b285
Lajos Molnar [Thu, 14 May 2015 19:13:32 +0000 (12:13 -0700)]
media: remove setPlaybackRate from MediaPlayer and MediSync
Condensed them to an internal easyPlaybackParams to create
PlaybackParams from a rate and audio mode.
Bug:
21045118
Change-Id: I89879a3034c905e34cabef8ff0237048e097a8e0
Yorke Lee [Thu, 14 May 2015 17:32:44 +0000 (17:32 +0000)]
Merge "Make Conferenceable an abstract class" into mnc-dev
Dan Sandler [Thu, 14 May 2015 15:44:32 +0000 (11:44 -0400)]
Use Context instead of Resources in Icon.createWithResource.
This works around situations where corrupted packages cause
Resources.getResourcePackageName to return something that
does't actually work.
Bug:
21144636
Change-Id: I271518599a8eb89d493f1ceda6cb2e47fb38a4ff
Andrei Stingaceanu [Thu, 14 May 2015 17:21:08 +0000 (17:21 +0000)]
Merge "Editor: enable double tap for selection after cut/copy." into mnc-dev
Clara Bayarri [Thu, 14 May 2015 16:44:45 +0000 (16:44 +0000)]
Merge "PhoneWindow ActionMode handling tests" into mnc-dev
Alan Viverette [Thu, 14 May 2015 16:39:18 +0000 (16:39 +0000)]
Merge "Add example for detectResourceMismatches()" into mnc-dev
Daniel Sandler [Thu, 14 May 2015 16:34:52 +0000 (16:34 +0000)]
Merge "Revert "Icon support comes to Notification."" into mnc-dev
Daniel Sandler [Thu, 14 May 2015 15:32:28 +0000 (15:32 +0000)]
Revert "Icon support comes to Notification."
This reverts commit
08a04c15245c970856022d0779aa27d4d63cdee3.
This also reverts commit
5bcbf857d129f4513e562801a4e88077b2655ade.
Change-Id: Ia0b0a5339d523581c877822a3a1feec97ae4b73d
Joe Fernandez [Thu, 14 May 2015 16:05:33 +0000 (16:05 +0000)]
am
a90cb675: am
a0f0b5bf: am
574690b1: Merge "docs: Add weekly subscriptions and grace period information to IAB docs" into lmp-mr1-ub-docs
* commit '
a90cb675a53ebf9a749bcaefc19ba00c8cbf7570':
docs: Add weekly subscriptions and grace period information to IAB docs
Paul McLean [Thu, 14 May 2015 15:59:37 +0000 (15:59 +0000)]
Merge "New policy for internal and wired device names." into mnc-dev
Paul McLean [Thu, 14 May 2015 15:59:18 +0000 (15:59 +0000)]
Merge "Add manufacturer-provided device name for AudioPort name field for BT devices. Change "a2dp-device" to empty string for EnumAPI." into mnc-dev
Joe Fernandez [Thu, 14 May 2015 15:53:44 +0000 (15:53 +0000)]
am
a0f0b5bf: am
574690b1: Merge "docs: Add weekly subscriptions and grace period information to IAB docs" into lmp-mr1-ub-docs
* commit '
a0f0b5bfd8df9e0caa6848bc479f1ed3dc492efc':
docs: Add weekly subscriptions and grace period information to IAB docs
Chris Craik [Thu, 14 May 2015 15:53:17 +0000 (15:53 +0000)]
Merge "Add tracing for path texture upload" into mnc-dev