OSDN Git Service
Yin-Chia Yeh [Thu, 14 May 2015 22:21:30 +0000 (22:21 +0000)]
am
a0807a65: Merge "Camera: tonemap linkify update" into mnc-dev
* commit '
a0807a65e93aeb7c73fb2fcc68244ab324dd3c07':
Camera: tonemap linkify update
Yin-Chia Yeh [Thu, 14 May 2015 22:12:29 +0000 (22:12 +0000)]
Merge "Camera: tonemap linkify update" into mnc-dev
Zhijun He [Thu, 14 May 2015 21:55:59 +0000 (21:55 +0000)]
am
758e6a8f: Merge "ImageReader: Image getFormat should return the Image buffer format" into mnc-dev
* commit '
758e6a8f70b28e1584588b06b12d227deeefba74':
ImageReader: Image getFormat should return the Image buffer format
Zhijun He [Thu, 14 May 2015 21:55:54 +0000 (21:55 +0000)]
am
492afe90: Merge "Image/Reader/Writer: address API review comments" into mnc-dev
* commit '
492afe901459274ea8b9dd52815d3f51dd1f244f':
Image/Reader/Writer: address API review comments
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
Joe LaPenna [Thu, 14 May 2015 21:37:36 +0000 (21:37 +0000)]
am
21de2f62: am
08bea4c9: (-s ours) am
627f2681: Merge "Wait for KEY_SLEEP UP event before calling goToSleep()" into lmp-mr1-modular-dev
* commit '
21de2f629df37014dd269e746924374f3df0811a':
Wait for KEY_SLEEP UP event before calling goToSleep()
Chong Zhang [Thu, 14 May 2015 21:37:31 +0000 (21:37 +0000)]
am
7fc802bb: Merge "MediaDataSource: address API council comments" into mnc-dev
* commit '
7fc802bbf750a8ed6be0e1858ebcf9740dda15cb':
MediaDataSource: address API council comments
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
Lajos Molnar [Thu, 14 May 2015 21:27:48 +0000 (21:27 +0000)]
am
51bf5d9c: Merge "media: remove setPlaybackRate from MediaPlayer and MediSync" into mnc-dev
* commit '
51bf5d9c078a57b52da786979103674588c2116c':
media: remove setPlaybackRate from MediaPlayer and MediSync
Lajos Molnar [Thu, 14 May 2015 21:27:42 +0000 (21:27 +0000)]
am
af047944: Merge "media: change final fields to accessors in MediaTimestamp" into mnc-dev
* commit '
af0479446bf2bfaa252bfe4bc924346632013f40':
media: change final fields to accessors in MediaTimestamp
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
Xiaohui Chen [Thu, 14 May 2015 21:17:51 +0000 (21:17 +0000)]
am
55a30240: Merge "wallpaper: avoid exception when user is not initialized" into mnc-dev
* commit '
55a302402be3240c9e3289351c01e1cd2e853bc8':
wallpaper: avoid exception when user is not initialized
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
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:51:26 +0000 (20:51 +0000)]
am
3b7bc569: Merge "Camera2: Fix reprocessing API naming and docs" into mnc-dev
* commit '
3b7bc569e6e31b7cb4a074e0d23994f7a4797feb':
Camera2: Fix reprocessing API naming and docs
Mikhail Naganov [Thu, 14 May 2015 20:51:21 +0000 (20:51 +0000)]
am
93559668: Merge "Tiny fix after updating the error reporting API" into mnc-dev
* commit '
9355966878460e3103a8da5eac8ecb5d2de97717':
Tiny fix after updating the error reporting API
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:41:11 +0000 (20:41 +0000)]
am
de355db3: Merge "Change the location of Brandmaster statement file." into mnc-dev
* commit '
de355db3ec6e24dd75ccec93f6c613f8f114ab28':
Change the location of Brandmaster statement file.
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:29:16 +0000 (20:29 +0000)]
am
f93d16bc: Merge "Avoid sealed check when unparceling AccessibilityNodeInfo" into mnc-dev
* commit '
f93d16bc705027aaca3a9c36788e0c1f26233bd0':
Avoid sealed check when unparceling AccessibilityNodeInfo
Jason Sams [Thu, 14 May 2015 20:29:11 +0000 (20:29 +0000)]
am
f0616532: Merge "Fix issues found during CTS testing of FP16" into mnc-dev
* commit '
f06165320281ef1cb5e7ebbeef42a93a77cbd553':
Fix issues found during CTS testing of FP16
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:09:27 +0000 (20:09 +0000)]
am
fed0196b: Merge "Lock top task if whitelisting arrives after start." into mnc-dev
* commit '
fed0196b9500b9f1e58071b177fb02245d8e4e91':
Lock top task if whitelisting arrives after start.
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
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:38:25 +0000 (19:38 +0000)]
am
92847c96: Merge "Revert "Update IME focus when the active view is losing the focus."" into mnc-dev
* commit '
92847c968754f3fc2ffe849cf54ef6dd49b3e744':
Revert "Update IME focus when the active view is losing the focus."
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:45:11 +0000 (17:45 +0000)]
am
0125d76f: Merge "Make Conferenceable an abstract class" into mnc-dev
* commit '
0125d76fa37d26a29f06371ff349546e21cd3f4d':
Make Conferenceable an abstract class
Andrei Stingaceanu [Thu, 14 May 2015 17:34:11 +0000 (17:34 +0000)]
am
d674f230: Merge "Editor: enable double tap for selection after cut/copy." into mnc-dev
* commit '
d674f2308aa1dd8f6f6df9d3cdd552e2aec0e64e':
Editor: enable double tap for selection after cut/copy.
Yorke Lee [Thu, 14 May 2015 17:32:44 +0000 (17:32 +0000)]
Merge "Make Conferenceable an abstract class" into mnc-dev
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:53:14 +0000 (16:53 +0000)]
am
fdf9f40c: Merge "PhoneWindow ActionMode handling tests" into mnc-dev
* commit '
fdf9f40cb8ca35a1d56d8cde494c6ed9602b4e48':
PhoneWindow ActionMode handling tests
Alan Viverette [Thu, 14 May 2015 16:47:55 +0000 (16:47 +0000)]
am
8d0cf8bc: Merge "Add example for detectResourceMismatches()" into mnc-dev
* commit '
8d0cf8bc457b48a0c8d43cf23928956ae3ca2a28':
Add example for detectResourceMismatches()
Daniel Sandler [Thu, 14 May 2015 16:47:50 +0000 (16:47 +0000)]
am
9cb90cbb: Merge "Revert "Icon support comes to Notification."" into mnc-dev
* commit '
9cb90cbbf8fc91793dad1d1cb317079dbc7e8421':
Revert "Icon support comes to Notification."
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
Joe Fernandez [Thu, 14 May 2015 16:31:20 +0000 (16:31 +0000)]
am
dfdbc3a8: am
a90cb675: am
a0f0b5bf: am
574690b1: Merge "docs: Add weekly subscriptions and grace period information to IAB docs" into lmp-mr1-ub-docs
* commit '
dfdbc3a8918a698a69880816a59d9e5ca2ee185f':
docs: Add weekly subscriptions and grace period information to IAB docs
Paul McLean [Thu, 14 May 2015 16:31:14 +0000 (16:31 +0000)]
am
f799491f: Merge "New policy for internal and wired device names." into mnc-dev
* commit '
f799491fb4781c890625cfd0d2b397abbfb169e3':
New policy for internal and wired device names.
Paul McLean [Thu, 14 May 2015 16:31:10 +0000 (16:31 +0000)]
am
fc56b88a: Merge "Add manufacturer-provided device name for AudioPort name field for BT devices. Change "a2dp-device" to empty string for EnumAPI." into mnc-dev
* commit '
fc56b88ac4ea56c53f9ab648b6a92d85a05562c8':
Add manufacturer-provided device name for AudioPort name field for BT devices. Change "a2dp-device" to empty string for EnumAPI.
Chris Craik [Thu, 14 May 2015 16:31:05 +0000 (16:31 +0000)]
am
30bc0b9e: Merge "Add tracing for path texture upload" into mnc-dev
* commit '
30bc0b9ebb6ea60427f4c42bb019557299dc2753':
Add tracing for path texture upload
Alex Klyubin [Thu, 14 May 2015 16:31:00 +0000 (16:31 +0000)]
am
a1fb2cf6: Merge "Move Android Keystore impl to android.security.keystore." into mnc-dev
* commit '
a1fb2cf6a6b8e69b57346b598e1c0904614250d7':
Move Android Keystore impl to android.security.keystore.
Michael Wright [Thu, 14 May 2015 16:30:53 +0000 (16:30 +0000)]
am
1b2e5c11: Merge "Revert "Revert "Add new MotionEvent actions for button press and release.""" into mnc-dev
* commit '
1b2e5c11b6a89d56d5058907c3b0c88bf0170857':
Revert "Revert "Add new MotionEvent actions for button press and release.""
Zoltan Szatmary-Ban [Thu, 14 May 2015 16:30:46 +0000 (16:30 +0000)]
am
39b8c69a: Merge "Rename NetworkUsageStats -> NetworkStats" into mnc-dev
* commit '
39b8c69a2356b03b56c7f11385a35bef58d2fceb':
Rename NetworkUsageStats -> NetworkStats
Dan Sandler [Thu, 14 May 2015 16:30:41 +0000 (16:30 +0000)]
am
5bcbf857: Merge "Fix icon-related crash." into mnc-dev
* commit '
5bcbf857d129f4513e562801a4e88077b2655ade':
Fix icon-related crash.
Lorenzo Colitti [Thu, 14 May 2015 16:30:36 +0000 (16:30 +0000)]
am
9e2d14be: Merge "Don\'t display the "no Internet access" prompt on captive portals." into mnc-dev
* commit '
9e2d14beb32bde5c5093f6fb0f1a5c8e14e41029':
Don't display the "no Internet access" prompt on captive portals.
Xiyuan Xia [Thu, 14 May 2015 16:30:32 +0000 (16:30 +0000)]
am
09e8303f: Merge "Clear security message on user input" into mnc-dev
* commit '
09e8303fd8eb2368f2de0763ecf6fee868d5d71c':
Clear security message on user input
John Reck [Thu, 14 May 2015 16:30:23 +0000 (16:30 +0000)]
am
a0f6b87b: am
570b2052: (-s ours) DO NOT MERGE resolved conflicts for merge of
951f2347 to lmp-mr1-ub-dev
* commit '
a0f6b87bbbbc10700aa14d2c4d9191fe1f064a60':
Revert "DO NOT MERGE Backport of limited jank-tracking metrics"
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
Alex Klyubin [Thu, 14 May 2015 15:51:00 +0000 (15:51 +0000)]
Merge "Move Android Keystore impl to android.security.keystore." into mnc-dev
Joe Fernandez [Thu, 14 May 2015 15:40:38 +0000 (15:40 +0000)]
am
574690b1: Merge "docs: Add weekly subscriptions and grace period information to IAB docs" into lmp-mr1-ub-docs
* commit '
574690b13c8f0d4835c6d86b8e26fc4c9b914037':
docs: Add weekly subscriptions and grace period information to IAB docs
Clara Bayarri [Thu, 7 May 2015 15:13:41 +0000 (16:13 +0100)]
PhoneWindow ActionMode handling tests
Tests focusing on action mode creation, how the two types of
modes are handled together and how the lifecycle is handled.
Change-Id: I17fe7a83cba4651b295a8ce80bc449f2f2538048
Michael Wright [Thu, 14 May 2015 15:31:10 +0000 (15:31 +0000)]
Merge "Revert "Revert "Add new MotionEvent actions for button press and release.""" into mnc-dev
Joe Fernandez [Thu, 14 May 2015 15:26:36 +0000 (15:26 +0000)]
Merge "docs: Add weekly subscriptions and grace period information to IAB docs" into lmp-mr1-ub-docs
Andrei Stingaceanu [Thu, 14 May 2015 15:17:13 +0000 (15:17 +0000)]
am
fa660f79: Merge "Fix: text selection bubbles move along with the text" into mnc-dev
* commit '
fa660f79e9551ca46efa6eaed26cff06095fbcd8':
Fix: text selection bubbles move along with the text
Rubin Xu [Thu, 14 May 2015 15:17:07 +0000 (15:17 +0000)]
am
6e1c17a3: Merge "clear caller identify before sending system update notification" into mnc-dev
* commit '
6e1c17a3dfd62f3ae2a16ac64b8575fc3aa4a7a2':
clear caller identify before sending system update notification
Michael Wright [Thu, 14 May 2015 15:17:00 +0000 (15:17 +0000)]
am
3d528698: Merge "Revert "Add new MotionEvent actions for button press and release."" into mnc-dev
* commit '
3d5286983447262f12b78785391681b20a71f6b2':
Revert "Add new MotionEvent actions for button press and release."
Michael Wright [Thu, 14 May 2015 15:16:52 +0000 (15:16 +0000)]
am
07b83f1c: Merge "Add new MotionEvent actions for button press and release." into mnc-dev
* commit '
07b83f1c9e8a7692a985aa2d13ac13fc5521aa4b':
Add new MotionEvent actions for button press and release.
Wojciech Staszkiewicz [Thu, 14 May 2015 15:16:39 +0000 (15:16 +0000)]
am
be752b1f: Merge "Pass charset to XmlPullParser.setInput instead of null" into mnc-dev
* commit '
be752b1f28f1f3724b235e3f0a77b4c07c40e631':
Pass charset to XmlPullParser.setInput instead of null
Andrei Stingaceanu [Thu, 14 May 2015 15:16:33 +0000 (15:16 +0000)]
am
c398adf8: Merge "Fix floating toolbar popping frequently after Replace/Copy" into mnc-dev
* commit '
c398adf81c5167fc4b9b9cefd1550bc8fd4a54e6':
Fix floating toolbar popping frequently after Replace/Copy
Narayan Kamath [Thu, 14 May 2015 15:15:54 +0000 (15:15 +0000)]
am
e738bb67: Merge "Fix build." into mnc-dev
* commit '
e738bb67224b47b1caa87e474d5530759aa1eea0':
Fix build.
Andrei Stingaceanu [Thu, 14 May 2015 15:15:48 +0000 (15:15 +0000)]
am
78e2f07e: Merge "Fix: replace terminates extract mode (floating toolbar)" into mnc-dev
* commit '
78e2f07e81ee9040a4ecca331411123ef35d81c2':
Fix: replace terminates extract mode (floating toolbar)
Chris Banes [Thu, 14 May 2015 15:15:39 +0000 (15:15 +0000)]
am
18ee0524: Merge "Fix build; doc link in ImageView" into mnc-dev
* commit '
18ee0524f02dda8ea1a16c083238ab6ddb2735ab':
Fix build; doc link in ImageView
Clara Bayarri [Thu, 14 May 2015 15:15:34 +0000 (15:15 +0000)]
am
e094b2af: Merge "Tests for WindowDecorActionBar\'s startActionMode implementation" into mnc-dev
* commit '
e094b2aff04105d63fa930f873a948e4104ca0f0':
Tests for WindowDecorActionBar's startActionMode implementation
Clara Bayarri [Thu, 14 May 2015 15:15:28 +0000 (15:15 +0000)]
am
bff329b8: Merge "Tests for ActionBarContainer\'s startActionModeForChild" into mnc-dev
* commit '
bff329b851a4806672842dc3e4608cee18ae9a1e':
Tests for ActionBarContainer's startActionModeForChild
Geoff Mendal [Thu, 14 May 2015 15:15:23 +0000 (15:15 +0000)]
am
e9db8f8f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
e9db8f8fe7b036fcdb015a960f5d28f37243ada7':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 14 May 2015 15:15:18 +0000 (15:15 +0000)]
am
b065a136: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
b065a1365a0cf0f9a7484af05333907a04481c60':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 14 May 2015 15:15:13 +0000 (15:15 +0000)]
am
027d5126: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
027d5126f22919d8b2ab3f6331113aaa67511d02':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 14 May 2015 15:15:03 +0000 (15:15 +0000)]
am
69ea07be: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
69ea07be05e062c360d103009b0ae000b520532b':
Import translations. DO NOT MERGE
Robin Lee [Thu, 14 May 2015 15:14:53 +0000 (15:14 +0000)]
am
39087b1c: Replace String host:port/url args with Uri arg
* commit '
39087b1cec6a54e96ab9eafe8317952720790533':
Replace String host:port/url args with Uri arg
Deepanshu Gupta [Thu, 14 May 2015 15:14:39 +0000 (15:14 +0000)]
am
a47fb5ad: Merge "Fix build." into mnc-dev
* commit '
a47fb5ad5d3863bc6de418c7269d2463f39f432b':
Fix build.
Deepanshu Gupta [Thu, 14 May 2015 15:14:29 +0000 (15:14 +0000)]
am
228837b1: Merge "Update rendering fidelity tag to use constant." into mnc-dev
* commit '
228837b180de980abf68309d3547b3181441467d':
Update rendering fidelity tag to use constant.
Deepanshu Gupta [Thu, 14 May 2015 15:14:23 +0000 (15:14 +0000)]
am
e6460224: Merge "Revert "Call dispatchFinishTemporaryDetach before returning a transient view"" into mnc-dev
* commit '
e646022429aa6e2150fff883d509be3f739205f4':
Revert "Call dispatchFinishTemporaryDetach before returning a transient view"
Geoff Mendal [Thu, 14 May 2015 15:14:03 +0000 (15:14 +0000)]
am
3a76780c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
3a76780cf9bbb22a6d6f144c86910f026d32a4a8':
Import translations. DO NOT MERGE
Deepanshu Gupta [Thu, 14 May 2015 15:13:55 +0000 (15:13 +0000)]
am
11a3f9aa: Merge "Use Balanced line breaker instead of HighQuality." into mnc-dev
* commit '
11a3f9aa6736f2ef698b413c63682492faefbcdc':
Use Balanced line breaker instead of HighQuality.
Deepanshu Gupta [Thu, 14 May 2015 15:13:49 +0000 (15:13 +0000)]
am
63b3332f: Merge "Update nav bar icons." into mnc-dev
* commit '
63b3332fad70e814e9fc0aa85d00f8d6d82b3059':
Update nav bar icons.
Deepanshu Gupta [Thu, 14 May 2015 15:13:44 +0000 (15:13 +0000)]
am
addf6266: Merge "Load ICU data in LayoutLib" into mnc-dev
* commit '
addf6266288ee7e00ee3d223865a68a49f62e4bf':
Load ICU data in LayoutLib
Deepanshu Gupta [Thu, 14 May 2015 15:13:38 +0000 (15:13 +0000)]
am
4728cd17: Merge "Add missing delegates for M preview." into mnc-dev
* commit '
4728cd1706073a699b39f27e12719989526b4dfe':
Add missing delegates for M preview.
Zoltan Szatmary-Ban [Thu, 14 May 2015 15:13:33 +0000 (15:13 +0000)]
Merge "Rename NetworkUsageStats -> NetworkStats" into mnc-dev
Deepanshu Gupta [Thu, 14 May 2015 15:13:32 +0000 (15:13 +0000)]
am
a2366b0c: Merge "Run setup for full tests only once." into mnc-dev
* commit '
a2366b0c2eb4a7607ad5654fd635431c4f410366':
Run setup for full tests only once.
Deepanshu Gupta [Thu, 14 May 2015 15:13:24 +0000 (15:13 +0000)]
am
db42c336: Merge "Remove kxml dependency." into mnc-dev
* commit '
db42c336caaef3e9dce6fdc04d78040e91c55a8b':
Remove kxml dependency.