OSDN Git Service
Jorim Jaggi [Thu, 14 May 2015 23:48:56 +0000 (23:48 +0000)]
am
52bb6c26: am
97993692: Fix brightness mirror positioning.
* commit '
52bb6c26c89bdbf44f1263532e216a758e80c0b3':
Fix brightness mirror positioning.
Deepanshu Gupta [Thu, 14 May 2015 23:48:51 +0000 (23:48 +0000)]
am
106c6ba3: am
af4d3d2d: Merge "Don\'t keep LayoutlibCallback reference." into mnc-dev
* commit '
106c6ba38b277b387d044eaa3433a1f3aababe68':
Don't keep LayoutlibCallback reference.
Jinsuk Kim [Thu, 14 May 2015 23:38:00 +0000 (23:38 +0000)]
am
03c8750d: am
f2fb0e73: Merge "CEC: Remove obsolete TODOs" into mnc-dev
* commit '
03c8750d3162dd32e5110a354e5a2a2237b7c01f':
CEC: Remove obsolete TODOs
Jorim Jaggi [Thu, 14 May 2015 23:33:57 +0000 (23:33 +0000)]
am
97993692: Fix brightness mirror positioning.
* commit '
979936920ee2e654e23678172c49b301e886c374':
Fix brightness mirror positioning.
Deepanshu Gupta [Thu, 14 May 2015 23:33:49 +0000 (23:33 +0000)]
am
af4d3d2d: Merge "Don\'t keep LayoutlibCallback reference." into mnc-dev
* commit '
af4d3d2d141b905fe6f92c9cce81ee76a8203fd8':
Don't keep LayoutlibCallback reference.
Jinsuk Kim [Thu, 14 May 2015 23:29:19 +0000 (23:29 +0000)]
am
f2fb0e73: Merge "CEC: Remove obsolete TODOs" into mnc-dev
* commit '
f2fb0e73f1e7a056c8986959b391ad29eabbf8f9':
CEC: Remove obsolete TODOs
Jorim Jaggi [Thu, 14 May 2015 00:39:18 +0000 (17:39 -0700)]
Fix brightness mirror positioning.
Bug:
20884993
Change-Id: Iba75c2dd7aca9b7ac446cb6a278085af4e150b95
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
Miao Wang [Thu, 14 May 2015 22:46:42 +0000 (22:46 +0000)]
am
bcaa424a: am
39a0b22c: Merge "[RenderScript] Add dummy getMinorID to maintain compatible with old RS compat lib." into mnc-dev
* commit '
bcaa424abc577135d02f4f2a1a55ac7b6c773f20':
[RenderScript] Add dummy getMinorID to maintain compatible with old RS compat lib.
Jorim Jaggi [Thu, 14 May 2015 22:46:37 +0000 (22:46 +0000)]
am
812eae18: am
3e02adb0: Fix closing state
* commit '
812eae1851cc77528aa696714471722cc1f71c50':
Fix closing state
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
Miao Wang [Thu, 14 May 2015 22:35:04 +0000 (22:35 +0000)]
am
39a0b22c: Merge "[RenderScript] Add dummy getMinorID to maintain compatible with old RS compat lib." into mnc-dev
* commit '
39a0b22cf854963dc04dc7a7714b4a7a263e93aa':
[RenderScript] Add dummy getMinorID to maintain compatible with old RS compat lib.
Jorim Jaggi [Thu, 14 May 2015 22:34:59 +0000 (22:34 +0000)]
am
3e02adb0: Fix closing state
* commit '
3e02adb028741938dab9787fa1552f86b2558c9a':
Fix closing state
Deepanshu Gupta [Thu, 14 May 2015 22:34:13 +0000 (22:34 +0000)]
am
c55f0d8b: am
a8545890: Merge "Move couple of intellij libraries to project level." into mnc-dev
* commit '
c55f0d8b024f12b6ac2cfba28ff0c7fe7ee2e9c3':
Move couple of intellij libraries to project level.
Christopher Tate [Thu, 14 May 2015 22:34:08 +0000 (22:34 +0000)]
am
53ec4a66: am
474bb82f: Merge "Clarify docs for BackupTransport.initializeDevice()" into mnc-dev
* commit '
53ec4a66630ce14a4ad9e2976dd9863a12fe092c':
Clarify docs for BackupTransport.initializeDevice()
Yin-Chia Yeh [Thu, 14 May 2015 22:34:01 +0000 (22:34 +0000)]
am
499b0d9f: am
a0807a65: Merge "Camera: tonemap linkify update" into mnc-dev
* commit '
499b0d9fd3f1c7c3eec8bc2d6d3c989f1a7c5fd6':
Camera: tonemap linkify update
Deepanshu Gupta [Thu, 14 May 2015 22:25:33 +0000 (22:25 +0000)]
am
a8545890: Merge "Move couple of intellij libraries to project level." into mnc-dev
* commit '
a8545890ac7851dbd113535e14d170e083357f5b':
Move couple of intellij libraries to project level.
Christopher Tate [Thu, 14 May 2015 22:25:28 +0000 (22:25 +0000)]
am
474bb82f: Merge "Clarify docs for BackupTransport.initializeDevice()" into mnc-dev
* commit '
474bb82fd5dafdba8de917ed7a834ba68890678f':
Clarify docs for BackupTransport.initializeDevice()
Yin-Chia Yeh [Thu, 14 May 2015 22:25:22 +0000 (22:25 +0000)]
am
a0807a65: Merge "Camera: tonemap linkify update" into mnc-dev
* commit '
a0807a65e93aeb7c73fb2fcc68244ab324dd3c07':
Camera: tonemap linkify update
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
Zhijun He [Thu, 14 May 2015 22:11:16 +0000 (22:11 +0000)]
am
d0c2d0dc: am
758e6a8f: Merge "ImageReader: Image getFormat should return the Image buffer format" into mnc-dev
* commit '
d0c2d0dc0890a5580a75037685383390d1ce3065':
ImageReader: Image getFormat should return the Image buffer format
Zhijun He [Thu, 14 May 2015 22:11:12 +0000 (22:11 +0000)]
am
ff704248: am
492afe90: Merge "Image/Reader/Writer: address API review comments" into mnc-dev
* commit '
ff7042481a08a9b109be72982c9e38220c1262f5':
Image/Reader/Writer: address API review comments
Zhijun He [Thu, 14 May 2015 21:55:49 +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:43 +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
Joe LaPenna [Thu, 14 May 2015 21:51:09 +0000 (21:51 +0000)]
am
27ba8fef: am
21de2f62: am
08bea4c9: (-s ours) am
627f2681: Merge "Wait for KEY_SLEEP UP event before calling goToSleep()" into lmp-mr1-modular-dev
* commit '
27ba8fef99151ad4697d1809d97f785939febcc7':
Wait for KEY_SLEEP UP event before calling goToSleep()
Chong Zhang [Thu, 14 May 2015 21:51:04 +0000 (21:51 +0000)]
am
b27d3858: am
7fc802bb: Merge "MediaDataSource: address API council comments" into mnc-dev
* commit '
b27d38588aec4f0be4f09e26310ce7c4592453a9':
MediaDataSource: address API council 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
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
Joe LaPenna [Thu, 14 May 2015 21:37:12 +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:07 +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()
Lajos Molnar [Thu, 14 May 2015 21:33:19 +0000 (21:33 +0000)]
am
6500bbd4: am
51bf5d9c: Merge "media: remove setPlaybackRate from MediaPlayer and MediSync" into mnc-dev
* commit '
6500bbd4ed468e5b1fa615f19daa537dbccf7e3b':
media: remove setPlaybackRate from MediaPlayer and MediSync
Lajos Molnar [Thu, 14 May 2015 21:33:13 +0000 (21:33 +0000)]
am
879d52f1: am
af047944: Merge "media: change final fields to accessors in MediaTimestamp" into mnc-dev
* commit '
879d52f1763a07d5abf8b941244cacc409f5058f':
media: change final fields to accessors in MediaTimestamp
Xiaohui Chen [Thu, 14 May 2015 21:33:09 +0000 (21:33 +0000)]
am
2e036538: am
55a30240: Merge "wallpaper: avoid exception when user is not initialized" into mnc-dev
* commit '
2e0365386fce8360988362022bd924bff7fcac72':
wallpaper: avoid exception when user is not initialized
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:25:36 +0000 (21:25 +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:25:30 +0000 (21:25 +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
Xiaohui Chen [Thu, 14 May 2015 21:21:07 +0000 (21:21 +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
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
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()
Chien-Yu Chen [Thu, 14 May 2015 21:06:11 +0000 (21:06 +0000)]
am
ca0d787f: am
3b7bc569: Merge "Camera2: Fix reprocessing API naming and docs" into mnc-dev
* commit '
ca0d787f3863b4996b86a8f3f2fe9da850511004':
Camera2: Fix reprocessing API naming and docs
Mikhail Naganov [Thu, 14 May 2015 21:06:07 +0000 (21:06 +0000)]
am
993a0f70: am
93559668: Merge "Tiny fix after updating the error reporting API" into mnc-dev
* commit '
993a0f7088ba3d04e49251df40a6fdc28cdbd4c8':
Tiny fix after updating the error reporting API
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
Joseph Wen [Thu, 14 May 2015 20:51:57 +0000 (20:51 +0000)]
am
487e1655: am
de355db3: Merge "Change the location of Brandmaster statement file." into mnc-dev
* commit '
487e165547e089593aafe69eb4edc87f7f87a6fc':
Change the location of Brandmaster statement file.
Chien-Yu Chen [Thu, 14 May 2015 20:50:31 +0000 (20:50 +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:50:26 +0000 (20:50 +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
Alan Viverette [Thu, 14 May 2015 20:41:47 +0000 (20:41 +0000)]
am
462e926f: am
f93d16bc: Merge "Avoid sealed check when unparceling AccessibilityNodeInfo" into mnc-dev
* commit '
462e926f1012b7855ce5cc4b0090db5e5634eb52':
Avoid sealed check when unparceling AccessibilityNodeInfo
Jason Sams [Thu, 14 May 2015 20:41:42 +0000 (20:41 +0000)]
am
afff09ae: am
f0616532: Merge "Fix issues found during CTS testing of FP16" into mnc-dev
* commit '
afff09ae74db9f62120e8a786750cb5e51d716ae':
Fix issues found during CTS testing of FP16
Joseph Wen [Thu, 14 May 2015 20:39:46 +0000 (20:39 +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:18 +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:13 +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
Craig Mautner [Thu, 14 May 2015 20:22:02 +0000 (20:22 +0000)]
am
b6291689: am
fed0196b: Merge "Lock top task if whitelisting arrives after start." into mnc-dev
* commit '
b6291689527a40a13dc07485e1a4655f045930c3':
Lock top task if whitelisting arrives after start.
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:55 +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
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:46:51 +0000 (19:46 +0000)]
am
a14ebc73: am
92847c96: Merge "Revert "Update IME focus when the active view is losing the focus."" into mnc-dev
* commit '
a14ebc73cf26f893a8e72671a7562937ecbe6f2e':
Revert "Update IME focus when the active view is losing the focus."
Wale Ogunwale [Thu, 14 May 2015 19:37:25 +0000 (19:37 +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."
Yorke Lee [Thu, 14 May 2015 19:30:35 +0000 (19:30 +0000)]
am
eb497822: am
0125d76f: Merge "Make Conferenceable an abstract class" into mnc-dev
* commit '
eb4978224d8979611e1014fe55f33f9dc0fcc06b':
Make Conferenceable an abstract class
Andrei Stingaceanu [Thu, 14 May 2015 19:30:29 +0000 (19:30 +0000)]
am
c2bdee59: am
d674f230: Merge "Editor: enable double tap for selection after cut/copy." into mnc-dev
* commit '
c2bdee591f663fb41006f9b816f0098b10a3610f':
Editor: enable double tap for selection after cut/copy.
Clara Bayarri [Thu, 14 May 2015 19:30:09 +0000 (19:30 +0000)]
am
53abb7b4: am
fdf9f40c: Merge "PhoneWindow ActionMode handling tests" into mnc-dev
* commit '
53abb7b463052600cf83067b996b4258c1b624fa':
PhoneWindow ActionMode handling tests
Alan Viverette [Thu, 14 May 2015 19:30:03 +0000 (19:30 +0000)]
am
e3a32490: am
8d0cf8bc: Merge "Add example for detectResourceMismatches()" into mnc-dev
* commit '
e3a324900b88a7dc7d8694cd2c38882f39db52cc':
Add example for detectResourceMismatches()
Daniel Sandler [Thu, 14 May 2015 19:29:55 +0000 (19:29 +0000)]
am
15de90de: am
9cb90cbb: Merge "Revert "Icon support comes to Notification."" into mnc-dev
* commit '
15de90de0e7f2da9e28d1b46644faeb21df13300':
Revert "Icon support comes to Notification."
Joe Fernandez [Thu, 14 May 2015 19:29:39 +0000 (19:29 +0000)]
am
df0946b6: 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 '
df0946b67ff1289794bbe5520da3c933d9d2a551':
docs: Add weekly subscriptions and grace period information to IAB docs
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
Paul McLean [Thu, 14 May 2015 19:29:34 +0000 (19:29 +0000)]
am
b0f9f7b8: am
f799491f: Merge "New policy for internal and wired device names." into mnc-dev
* commit '
b0f9f7b8a6bc573918378ac617f6751c305f9cd6':
New policy for internal and wired device names.
Paul McLean [Thu, 14 May 2015 19:29:27 +0000 (19:29 +0000)]
am
5326ff97: 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 '
5326ff9757b9b48deaf85c2802661d79d09e28e3':
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 19:29:21 +0000 (19:29 +0000)]
am
18069065: am
30bc0b9e: Merge "Add tracing for path texture upload" into mnc-dev
* commit '
18069065d4e8752f55c78b62d679d3f7291270ac':
Add tracing for path texture upload
Alex Klyubin [Thu, 14 May 2015 19:29:13 +0000 (19:29 +0000)]
am
567936c9: am
a1fb2cf6: Merge "Move Android Keystore impl to android.security.keystore." into mnc-dev
* commit '
567936c9ab300884aeb54c68e6f0f90fe89a32b3':
Move Android Keystore impl to android.security.keystore.
Michael Wright [Thu, 14 May 2015 19:29:06 +0000 (19:29 +0000)]
am
edc7560a: am
1b2e5c11: Merge "Revert "Revert "Add new MotionEvent actions for button press and release.""" into mnc-dev
* commit '
edc7560af4534f881480b24dbeac4d44bdb5dee8':
Revert "Revert "Add new MotionEvent actions for button press and release.""
Zoltan Szatmary-Ban [Thu, 14 May 2015 19:28:59 +0000 (19:28 +0000)]
am
392f8ff5: am
39b8c69a: Merge "Rename NetworkUsageStats -> NetworkStats" into mnc-dev
* commit '
392f8ff51332395db515370f7093556f135f386e':
Rename NetworkUsageStats -> NetworkStats
Dan Sandler [Thu, 14 May 2015 19:28:53 +0000 (19:28 +0000)]
am
644d0318: am
5bcbf857: Merge "Fix icon-related crash." into mnc-dev
* commit '
644d0318f59a8057e219be6469ea66ba6d2ce3c1':
Fix icon-related crash.
Lorenzo Colitti [Thu, 14 May 2015 19:28:48 +0000 (19:28 +0000)]
am
e0efd004: am
9e2d14be: Merge "Don\'t display the "no Internet access" prompt on captive portals." into mnc-dev
* commit '
e0efd0047b07b76941c4a01ff8fa4fd038c6c7a9':
Don't display the "no Internet access" prompt on captive portals.
Xiyuan Xia [Thu, 14 May 2015 19:28:43 +0000 (19:28 +0000)]
am
f1844556: am
09e8303f: Merge "Clear security message on user input" into mnc-dev
* commit '
f1844556cb440c3328d1c0ad73ebb305fd86b1b9':
Clear security message on user input
John Reck [Thu, 14 May 2015 19:28:35 +0000 (19:28 +0000)]
am
24592866: am
a0f6b87b: am
570b2052: (-s ours) DO NOT MERGE resolved conflicts for merge of
951f2347 to lmp-mr1-ub-dev
* commit '
24592866835a221ba1d0c3456827f89d04d4bd97':
Revert "DO NOT MERGE Backport of limited jank-tracking metrics"
Andrei Stingaceanu [Thu, 14 May 2015 19:28:29 +0000 (19:28 +0000)]
am
6f885d1b: am
fa660f79: Merge "Fix: text selection bubbles move along with the text" into mnc-dev
* commit '
6f885d1bb1bfb964d4404abe8ee63f25d24e68e9':
Fix: text selection bubbles move along with the text
Rubin Xu [Thu, 14 May 2015 19:28:24 +0000 (19:28 +0000)]
am
e52807d3: am
6e1c17a3: Merge "clear caller identify before sending system update notification" into mnc-dev
* commit '
e52807d3d00d103c4be78fc7ca447cf1bd994045':
clear caller identify before sending system update notification
Michael Wright [Thu, 14 May 2015 19:28:16 +0000 (19:28 +0000)]
am
87d3e2f4: am
3d528698: Merge "Revert "Add new MotionEvent actions for button press and release."" into mnc-dev
* commit '
87d3e2f4cdfcf5bf0e659f66b16dda165696e471':
Revert "Add new MotionEvent actions for button press and release."
Michael Wright [Thu, 14 May 2015 19:28:09 +0000 (19:28 +0000)]
am
ce0b8585: am
07b83f1c: Merge "Add new MotionEvent actions for button press and release." into mnc-dev
* commit '
ce0b858573c07c9394d81ee6960c42650b78f7df':
Add new MotionEvent actions for button press and release.
Wojciech Staszkiewicz [Thu, 14 May 2015 19:27:51 +0000 (19:27 +0000)]
am
e2ad30ef: am
be752b1f: Merge "Pass charset to XmlPullParser.setInput instead of null" into mnc-dev
* commit '
e2ad30ef5168d55f7c1b4a2dc4fe699be1bf8a48':
Pass charset to XmlPullParser.setInput instead of null
Andrei Stingaceanu [Thu, 14 May 2015 19:27:43 +0000 (19:27 +0000)]
am
dee1479c: am
c398adf8: Merge "Fix floating toolbar popping frequently after Replace/Copy" into mnc-dev
* commit '
dee1479c90179b7307cb889a4a233ef8633fabe8':
Fix floating toolbar popping frequently after Replace/Copy
OSDN Git Service
