OSDN Git Service
Glenn Kasten [Thu, 14 May 2015 14:48:44 +0000 (14:48 +0000)]
am
ada99cd7: Merge "Spell out parameters" into mnc-dev
* commit '
ada99cd76236999a2aaf030c2c1014e1078d415b':
Spell out parameters
Alan Viverette [Thu, 14 May 2015 14:48:38 +0000 (14:48 +0000)]
am
c25771ce: Merge "Update scrollIndicators XML enums to match View constants" into mnc-dev
* commit '
c25771ce224d6dc2dd3bc4df91ca08069a0f72de':
Update scrollIndicators XML enums to match View constants
Roozbeh Pournader [Thu, 14 May 2015 14:47:40 +0000 (14:47 +0000)]
am
0ca0f580: Merge "Add hyphenationFrequency attribute to TextView and StaticLayout." into mnc-dev
* commit '
0ca0f5800034f5fbd041d31617efa75f9d727885':
Add hyphenationFrequency attribute to TextView and StaticLayout.
Xiyuan Xia [Thu, 14 May 2015 14:46:51 +0000 (14:46 +0000)]
am
55e603ee: Merge "Make PIN/Password/Pattern check async" into mnc-dev
* commit '
55e603ee9de06125751292c84f1b25fb9a78d4e4':
Make PIN/Password/Pattern check async
Mike Lockwood [Thu, 14 May 2015 14:46:37 +0000 (14:46 +0000)]
am
62975ae4: Merge "MidiManager: Address API Council feedback:" into mnc-dev
* commit '
62975ae43d089deed93692783f350f6df079006f':
MidiManager: Address API Council feedback:
Jinsuk Kim [Thu, 14 May 2015 14:45:46 +0000 (14:45 +0000)]
am
6dda58e7: Merge "CEC: Let playback device send <Standby> upon power off" into mnc-dev
* commit '
6dda58e7acb13f8a9c3fab385055eedf7d5c9416':
CEC: Let playback device send <Standby> upon power off
Yang Ni [Thu, 14 May 2015 14:45:36 +0000 (14:45 +0000)]
am
20e16f4f: Merge "Elaborate on description of ScriptGroup.execute" into mnc-dev
* commit '
20e16f4f762ddaf8a3574ad03c3f3a9f97a44637':
Elaborate on description of ScriptGroup.execute
Santos Cordon [Thu, 14 May 2015 14:45:20 +0000 (14:45 +0000)]
am
115cdd48: Merge "Fix build break." into mnc-dev
* commit '
115cdd488b616965437709df5002d5e935e3b980':
Fix build break.
Jason Sams [Thu, 14 May 2015 14:45:09 +0000 (14:45 +0000)]
am
0cf42ffb: Merge "Fix API name based on API review" into mnc-dev
* commit '
0cf42ffbbef8737b239f03224b0c11782b5db0b2':
Fix API name based on API review
Adrian Roos [Thu, 14 May 2015 14:44:57 +0000 (14:44 +0000)]
am
51cfdd62: Merge "Only dispatch systemUiVisibility when it actually changes" into mnc-dev
* commit '
51cfdd622f8a9082c1081cf32eb60340db7eb0e8':
Only dispatch systemUiVisibility when it actually changes
Yorke Lee [Thu, 14 May 2015 14:44:26 +0000 (14:44 +0000)]
am
d74c31e2: Merge "Fixes for APi review" into mnc-dev
* commit '
d74c31e253b1fdcfc62bf6343ac85b6bd5f08243':
Fixes for APi review
Alan Viverette [Thu, 14 May 2015 14:44:06 +0000 (14:44 +0000)]
am
01193e03: Specify tint on top-level vector tag, rather than fillColor
* commit '
01193e031b31040945626b7cdec611c87bf54e4c':
Specify tint on top-level vector tag, rather than fillColor
Glenn Kasten [Tue, 12 May 2015 23:39:12 +0000 (23:39 +0000)]
Merge "Spell out parameters" into mnc-dev
Alan Viverette [Tue, 12 May 2015 23:34:11 +0000 (23:34 +0000)]
Merge "Update scrollIndicators XML enums to match View constants" into mnc-dev
Alan Viverette [Tue, 12 May 2015 23:25:47 +0000 (16:25 -0700)]
Update scrollIndicators XML enums to match View constants
Bug:
21027462
Change-Id: I41e503e218253cf63bc44a82345f8b086261e379
Santos Cordon [Tue, 12 May 2015 23:22:32 +0000 (23:22 +0000)]
am
3aea94ff: Merge "Rename Connection time APIs for Conference.java" into mnc-dev
* commit '
3aea94ff56a409cae7698832a7fe54c1bcb708d5':
Rename Connection time APIs for Conference.java
Jeff Sharkey [Tue, 12 May 2015 23:22:26 +0000 (23:22 +0000)]
am
bf6fbb00: Merge "Ignore abandon after install relinquished." into mnc-dev
* commit '
bf6fbb0040a9b37158d50102560ab57b98cae9ad':
Ignore abandon after install relinquished.
Dianne Hackborn [Tue, 12 May 2015 23:22:17 +0000 (23:22 +0000)]
am
f931e3c2: Merge "Always use REGISTERED_ONLY when appropriate." into mnc-dev
* commit '
f931e3c28422a9169e01b2be62ac17c5159a70d0':
Always use REGISTERED_ONLY when appropriate.
Santos Cordon [Tue, 12 May 2015 23:21:59 +0000 (23:21 +0000)]
am
2d9a9c2a: Merge "Add RemoteConference javadocs." into mnc-dev
* commit '
2d9a9c2ad98f566494071c4d38bed5c6ee6bf383':
Add RemoteConference javadocs.
Chien-Yu Chen [Tue, 12 May 2015 23:21:53 +0000 (23:21 +0000)]
am
4f6615a3: Merge "Camera2: stream configs for reprocessible session" into mnc-dev
* commit '
4f6615a30c6c1ec73a62621babe0a87277639242':
Camera2: stream configs for reprocessible session
Wale Ogunwale [Tue, 12 May 2015 23:21:43 +0000 (23:21 +0000)]
am
f99bde92: Merge "Determine if TaskRecord is privilaged from creating ActivityInfo." into mnc-dev
* commit '
f99bde92c242aa4fa57bba95013c6fff7af1fca1':
Determine if TaskRecord is privilaged from creating ActivityInfo.
John Spurlock [Tue, 12 May 2015 23:21:38 +0000 (23:21 +0000)]
am
e12931f6: Merge "DNDTile: Notify of value changes." into mnc-dev
* commit '
e12931f6a5daf0f740f249aec8c3bab948b367f0':
DNDTile: Notify of value changes.
Alex Klyubin [Tue, 12 May 2015 23:21:32 +0000 (23:21 +0000)]
am
c5a142f8: Merge "Flatten KeyStoreKeyProperties constants." into mnc-dev
* commit '
c5a142f82b85aef4d740af4e8fefedf1cd0333fe':
Flatten KeyStoreKeyProperties constants.
John Spurlock [Tue, 12 May 2015 23:21:26 +0000 (23:21 +0000)]
am
e66ba473: Merge "Zen: Ringer mode integration fixes." into mnc-dev
* commit '
e66ba4736667afb9ff3b1d3ebc487d024531f2a3':
Zen: Ringer mode integration fixes.
Chris Craik [Tue, 12 May 2015 23:21:18 +0000 (23:21 +0000)]
am
6af2857a: Merge "Revert "Fix build - Revert "Revert "Use default constructor to get anti-aliasing"""" into mnc-dev
* commit '
6af2857ae0c3bde47e0e4a6abd84f42ee7086291':
Revert "Fix build - Revert "Revert "Use default constructor to get anti-aliasing"""
Yohei Yukawa [Tue, 12 May 2015 23:21:02 +0000 (23:21 +0000)]
am
f038295e: Merge "Remove obsolete fields from InputMethodManager." into mnc-dev
* commit '
f038295e98846e3e359854b1642b362643bd6053':
Remove obsolete fields from InputMethodManager.
Dan Sandler [Tue, 12 May 2015 23:20:53 +0000 (23:20 +0000)]
am
dbd90f03: Merge "Tests for Notification object construction and parceling." into mnc-dev
* commit '
dbd90f032971d59bfb8e0fd2964a3ecb0a9843bd':
Tests for Notification object construction and parceling.
Jason Monk [Tue, 12 May 2015 23:20:45 +0000 (23:20 +0000)]
am
ba6a72fd: Merge "Fix crash in setup wizard" into mnc-dev
* commit '
ba6a72fd668c5396e2dc903806c915233bed43c7':
Fix crash in setup wizard
Rich Slogar [Tue, 12 May 2015 23:20:27 +0000 (23:20 +0000)]
am
389d5ac6: am
353232ec: am
b97afd41: am
a27dd186: am
e78f136b: Merge "docs: renderscript using gradle settings" into lmp-docs
* commit '
389d5ac6ac974f171c12eb608eb8a3e2cad120f8':
docs: renderscript using gradle settings
Wei Jia [Tue, 12 May 2015 23:20:14 +0000 (23:20 +0000)]
am
0cd3881a: Merge "MediaSync: rename bufferIndex to bufferId." into mnc-dev
* commit '
0cd3881aafe40a191db1bd6ff1e1723f25bbb6b0':
MediaSync: rename bufferIndex to bufferId.
Olawale Ogunwale [Tue, 12 May 2015 23:20:01 +0000 (23:20 +0000)]
am
e0b2cad0: Merge "Change attribute values per API council." into mnc-dev
* commit '
e0b2cad093760478e59a4aee5a7af43af2789db6':
Change attribute values per API council.
Wale Ogunwale [Tue, 12 May 2015 23:19:56 +0000 (23:19 +0000)]
am
2a857f00: Merge "Move visibleBehind activities into stop state when sleeping/powerDown" into mnc-dev
* commit '
2a857f00110c448d702ffa4ee998dfd78688fa21':
Move visibleBehind activities into stop state when sleeping/powerDown
P.Y. Laligand [Tue, 12 May 2015 23:19:50 +0000 (23:19 +0000)]
am
e6c47686: Merge "DO NOT MERGE - Display mode switches." into mnc-dev
* commit '
e6c47686f62643d3399218eef4728c22358cbcfb':
DO NOT MERGE - Display mode switches.
Doris Liu [Tue, 12 May 2015 23:19:46 +0000 (23:19 +0000)]
am
4b403557: Merge "Avoid setting mCurFrame to -1" into mnc-dev
* commit '
4b403557bca7b622c187c3b06814e2118ec7d985':
Avoid setting mCurFrame to -1
Alex Klyubin [Tue, 12 May 2015 23:19:40 +0000 (23:19 +0000)]
am
03064e25: Merge "Link to magic constants used by AndroidKeyStore API." into mnc-dev
* commit '
03064e25b284d7ee99563658c5966ee590f925f6':
Link to magic constants used by AndroidKeyStore API.
Christopher Tate [Tue, 12 May 2015 23:19:28 +0000 (23:19 +0000)]
am
54415439: Merge "Deprecate Context.MODE_MULTI_PROCESS" into mnc-dev
* commit '
54415439ca8d286c4efaf975a54fe0cc7872c86b':
Deprecate Context.MODE_MULTI_PROCESS
Chris Craik [Tue, 12 May 2015 23:19:22 +0000 (23:19 +0000)]
am
d2c05188: Merge "Fix build - Revert "Revert "Use default constructor to get anti-aliasing""" into mnc-dev
* commit '
d2c05188b669256ab9d6024ad5793e0ca891fed0':
Fix build - Revert "Revert "Use default constructor to get anti-aliasing""
Alex Klyubin [Tue, 12 May 2015 23:19:15 +0000 (23:19 +0000)]
am
15a7bb20: Merge "Move PointFormat constants into parent class." into mnc-dev
* commit '
15a7bb202d06bf73f4783d3aaa3d284ba84e08d1':
Move PointFormat constants into parent class.
Chris Craik [Tue, 12 May 2015 23:19:09 +0000 (23:19 +0000)]
am
fd41cf0c: Merge "Revert "Use default constructor to get anti-aliasing"" into mnc-dev
* commit '
fd41cf0cfc3d460606fbc176703e97fd8346a868':
Revert "Use default constructor to get anti-aliasing"
Alex Klyubin [Tue, 12 May 2015 23:18:51 +0000 (23:18 +0000)]
am
56b96da7: Merge "Hide @IntDef and @StringDef annotations from AnroidKeyStore API." into mnc-dev
* commit '
56b96da7e1f1825267662df762609c198a8c41d6':
Hide @IntDef and @StringDef annotations from AnroidKeyStore API.
Olawale Ogunwale [Tue, 12 May 2015 23:18:46 +0000 (23:18 +0000)]
am
3d8c6781: Merge "Don\'t apply animation clip to dialog activities" into mnc-dev
* commit '
3d8c678136ed34e2573a46123681e6a647e5537d':
Don't apply animation clip to dialog activities
Chris Craik [Tue, 12 May 2015 23:18:38 +0000 (23:18 +0000)]
am
dc9230b1: Merge "Shrink default path cache size" into mnc-dev
* commit '
dc9230b14ed86f5f5bc3b745242d7521828a924e':
Shrink default path cache size
Paul Jensen [Tue, 12 May 2015 23:18:32 +0000 (23:18 +0000)]
am
356a2612: Merge "Deprecate ConnectivityManager.isNetworkTypeValid as it\'s unneeded." into mnc-dev
* commit '
356a26122bf928709d88cdc9a4a304b4495b1b31':
Deprecate ConnectivityManager.isNetworkTypeValid as it's unneeded.
Christopher Tate [Tue, 12 May 2015 23:18:25 +0000 (23:18 +0000)]
am
c7374318: am
7a4cfa58: am
960cb481: am
613626b7: am
afd883f8: During early boot, send LOCALE_CHANGED only to registered receivers
* commit '
c7374318a69d4341235bd143b9fdae2cabcea3e9':
During early boot, send LOCALE_CHANGED only to registered receivers
Andre Eisenbach [Tue, 12 May 2015 23:18:10 +0000 (23:18 +0000)]
am
14dcb5f1: Bluetooth native dumpsys logging support (3/5)
* commit '
14dcb5f13852619e68a22446ee37510191718c3a':
Bluetooth native dumpsys logging support (3/5)
Chris Craik [Tue, 12 May 2015 23:17:53 +0000 (23:17 +0000)]
am
bf9c5c13: Merge "Remove usage of Texture::cleanup in PathCache" into mnc-dev
* commit '
bf9c5c13cd24350e85f534d2348c1dd4ba8a33df':
Remove usage of Texture::cleanup in PathCache
Jason Monk [Tue, 12 May 2015 23:17:37 +0000 (23:17 +0000)]
am
e74d5d09: Merge "Add SysUI Tuner" into mnc-dev
* commit '
e74d5d09e1749b128437ff340b43278857139338':
Add SysUI Tuner
Jason Monk [Tue, 12 May 2015 23:17:29 +0000 (23:17 +0000)]
am
2df11817: Merge "Add control for double tap to wake setting" into mnc-dev
* commit '
2df11817b2a84dd3d0a6635d9d9e526688a6e215':
Add control for double tap to wake setting
John Reck [Tue, 12 May 2015 23:17:22 +0000 (23:17 +0000)]
am
4bd4121d: Merge "Increase HISTORY_SIZE for GraphicsStatsService" into mnc-dev
* commit '
4bd4121d584e16c700ba08828c675b7f906ff331':
Increase HISTORY_SIZE for GraphicsStatsService
Amith Yamasani [Tue, 12 May 2015 23:17:13 +0000 (23:17 +0000)]
am
bb9d9278: Merge "Idle timebase" into mnc-dev
* commit '
bb9d9278aa6fe3ba3d4c21b03d3e3da4543a974c':
Idle timebase
Michael Wright [Tue, 12 May 2015 23:17:08 +0000 (23:17 +0000)]
am
6959865f: Merge "Remove SLEEP and POWER from wake key list." into mnc-dev
* commit '
6959865fb0de965b5a2c7a797bf26b8bf9d10228':
Remove SLEEP and POWER from wake key list.
Narayan Kamath [Tue, 12 May 2015 23:16:57 +0000 (23:16 +0000)]
am
5a7587fa: Fix file descriptor leak when opening invalid archives.
* commit '
5a7587fa90732c013bb9266f1bdae0a557455c15':
Fix file descriptor leak when opening invalid archives.
Ricky Wai [Tue, 12 May 2015 23:16:46 +0000 (23:16 +0000)]
am
227d42db: Merge "Fix LauncherActivityInfo.getBadgedIcon() cannot get high density icon" into mnc-dev
* commit '
227d42db5bd1bd16b6101f799052c10f4f493647':
Fix LauncherActivityInfo.getBadgedIcon() cannot get high density icon
Rubin Xu [Tue, 12 May 2015 23:16:40 +0000 (23:16 +0000)]
am
9fc8bb63: Merge "Tweak SystemUpdatePolicy according to API review." into mnc-dev
* commit '
9fc8bb63d8c15ecfcd3a72a685eaec6c8ec0aa6e':
Tweak SystemUpdatePolicy according to API review.
Clara Bayarri [Tue, 12 May 2015 23:16:35 +0000 (23:16 +0000)]
am
c12e4e46: Merge "Fix Floating toolbar is not refreshed when dragging insertion handle" into mnc-dev
* commit '
c12e4e468fa8c72875632b11b96b2f67ea98d7c0':
Fix Floating toolbar is not refreshed when dragging insertion handle
Jae Seo [Tue, 12 May 2015 23:16:16 +0000 (23:16 +0000)]
am
8ef4a3c9: Merge "TIF: Rename requestUnblockContent to unblockContent" into mnc-dev
* commit '
8ef4a3c9c0dd60bf8b0c959123d0afe1a62a153e':
TIF: Rename requestUnblockContent to unblockContent
Dongwon Kang [Tue, 12 May 2015 23:15:58 +0000 (23:15 +0000)]
am
b9e26621: Merge "TIF: add more documentation on Session.setOverlayViewEnabled()." into mnc-dev
* commit '
b9e26621ba46580c9208fde94260666558f81ab9':
TIF: add more documentation on Session.setOverlayViewEnabled().
Jae Seo [Tue, 12 May 2015 23:15:51 +0000 (23:15 +0000)]
am
cf1b4c77: Merge "TIF: Unhide the surface layout API" into mnc-dev
* commit '
cf1b4c77de26f0d3c0d8a9a037d43d49bd016540':
TIF: Unhide the surface layout API
Joe Fernandez [Tue, 12 May 2015 23:15:45 +0000 (23:15 +0000)]
am
57881dcf: am
f3c04204: am
13e39e3f: am
c1e97347: Merge "docs: studio 1.2.1.1 updates" into lmp-mr1-ub-docs
* commit '
57881dcfb152e7c4e1a081cc3e1d62ff51d82ab0':
docs: studio 1.2.1.1 updates
Jeff Hao [Tue, 12 May 2015 23:15:39 +0000 (23:15 +0000)]
am
bff52394: am
3da32f77: am
b1e9430a: am
c5ced5d3: Fix prototype for startMethodTracingSampling in profiling docs.
* commit '
bff523940fe466d7666246c49f47d20eed67f1e0':
Fix prototype for startMethodTracingSampling in profiling docs.
Jim Miller [Tue, 12 May 2015 23:15:26 +0000 (23:15 +0000)]
am
eeb60bc7: Merge "Fingerprint: Add Set Active Group" into mnc-dev
* commit '
eeb60bc7bbba2eed29d78dcc56ec1760655c5481':
Fingerprint: Add Set Active Group
Chris Craik [Tue, 12 May 2015 23:15:18 +0000 (23:15 +0000)]
am
2f957893: Merge "Fix ViewGroup caching defaults" into mnc-dev
* commit '
2f957893a43baeac92b8d827f8bfb627b62394ef':
Fix ViewGroup caching defaults
Fabrice Di Meglio [Tue, 12 May 2015 23:15:06 +0000 (23:15 +0000)]
am
e2f43948: Merge "Add user selectable Default Browser feature - part 6" into mnc-dev
* commit '
e2f43948d1de58e49192b97306e8a4e1c99412f4':
Add user selectable Default Browser feature - part 6
Selim Cinek [Tue, 12 May 2015 23:14:55 +0000 (23:14 +0000)]
am
7c4b054e: Gave more context on an accesibility string
* commit '
7c4b054ebffac9f00bae698865f291ce0a14032e':
Gave more context on an accesibility string
Selim Cinek [Tue, 12 May 2015 23:14:48 +0000 (23:14 +0000)]
am
35b7771f: Fixed a bug that the user could not drag down on the heads up
* commit '
35b7771fcbe57574d812adbc98acbba96ba47ae2':
Fixed a bug that the user could not drag down on the heads up
Jeff Hao [Tue, 12 May 2015 23:14:42 +0000 (23:14 +0000)]
am
6e88f0b7: Merge "Fix prototype for startMethodTracingSampling in profiling docs." into mnc-dev
* commit '
6e88f0b7bbcd67de76d46b0adc75b43fdb11611e':
Fix prototype for startMethodTracingSampling in profiling docs.
Selim Cinek [Tue, 12 May 2015 23:14:33 +0000 (23:14 +0000)]
am
b05f5739: Fixed a crash with the voice interaction service
* commit '
b05f5739bb62870f3d23d02c10fbbbaacbee93d4':
Fixed a crash with the voice interaction service
Selim Cinek [Tue, 12 May 2015 23:14:27 +0000 (23:14 +0000)]
am
737bff34: Fixed a bug where the HUN would interfere with the normal touches
* commit '
737bff3476a3af8f930d29fccce16d033fbc3efa':
Fixed a bug where the HUN would interfere with the normal touches
Svet Ganov [Tue, 12 May 2015 23:13:53 +0000 (23:13 +0000)]
am
981de3c5: Merge "Add permission meta-state flags to support grant/revoke permission policy." into mnc-dev
* commit '
981de3c57c5a3f1f35cf5a0c6c4c5513b1643d06':
Add permission meta-state flags to support grant/revoke permission policy.
Jeff Hao [Tue, 12 May 2015 23:13:47 +0000 (23:13 +0000)]
am
54965146: am
70159dfe: am
55c4816f: am
cf6a3b91: Update ddms and profiling docs to include sample profiling.
* commit '
5496514639a49035000bd3064f2a9275b272214b':
Update ddms and profiling docs to include sample profiling.
Jean-Michel Trivi [Tue, 12 May 2015 23:13:24 +0000 (23:13 +0000)]
am
cbcbb828: Merge "Prevent NPE in MediaSessionService" into mnc-dev
* commit '
cbcbb828e8e3d1f901be00c896d816d01c17b19d':
Prevent NPE in MediaSessionService
Jeff Hao [Tue, 12 May 2015 23:13:12 +0000 (23:13 +0000)]
am
a4492b41: Merge "Update ddms and profiling docs to include sample profiling." into mnc-dev
* commit '
a4492b418d23e3bcdb077aab5d48eb24e932fc13':
Update ddms and profiling docs to include sample profiling.
John Spurlock [Tue, 12 May 2015 23:13:03 +0000 (23:13 +0000)]
am
ceacb51e: Merge "Zen: Distinct icon for DND = total silence." into mnc-dev
* commit '
ceacb51e04c0c822f590c52916ff3a082f3a269b':
Zen: Distinct icon for DND = total silence.
Dianne Hackborn [Tue, 12 May 2015 23:12:51 +0000 (23:12 +0000)]
am
9c8600e1: Merge "Implement device idle in power manager." into mnc-dev
* commit '
9c8600e1af1af6eb2f57a965bbfe941fbd082786':
Implement device idle in power manager.
Quddus Chong [Tue, 12 May 2015 23:12:45 +0000 (23:12 +0000)]
am
b98e0712: am
ce4408a1: am
a7577843: am
d43ec638: am
174dc3ba: Merge "docs: Added training docs for Android unit testing tools and APIs. This training covers techniques for running unit tests on local machines, using mock objects in local unit tests, and building in
* commit '
b98e07129cc2cc7e51eb94ade8885f1d332efafe':
docs: Added training docs for Android unit testing tools and APIs. This training covers techniques for running unit tests on local machines, using mock objects in local unit tests, and building instrumented unit tests to run on a device or emulator.
Doris Liu [Tue, 12 May 2015 23:12:30 +0000 (23:12 +0000)]
am
a2f04382: Merge "Use ArrayMap instead of HashMap for storing relavant nodes" into mnc-dev
* commit '
a2f043822b870f09839d025e146e37f7e7646fc4':
Use ArrayMap instead of HashMap for storing relavant nodes
Jean-Michel Trivi [Tue, 12 May 2015 23:12:22 +0000 (23:12 +0000)]
am
4c08bc0f: Merge "AudioRecord.Builder works with no or partial parameters" into mnc-dev
* commit '
4c08bc0f61e6b5051b95ac0da7eaa6cd26c63765':
AudioRecord.Builder works with no or partial parameters
Yang Ni [Tue, 12 May 2015 23:12:00 +0000 (23:12 +0000)]
am
552518e3: Merge "Moved limit constants for kernel and script group" into mnc-dev
* commit '
552518e3c1241f643e3324f26fcc8f6d5bbde3d7':
Moved limit constants for kernel and script group
Miao Wang [Tue, 12 May 2015 23:11:54 +0000 (23:11 +0000)]
am
cb556e0d: Merge "[RenderScript] hide Allocation.copyToFieldPacker()" into mnc-dev
* commit '
cb556e0d25d4be11f5441c9b23c96633cfd4ca95':
[RenderScript] hide Allocation.copyToFieldPacker()
Fyodor Kupolov [Tue, 12 May 2015 23:11:47 +0000 (23:11 +0000)]
am
51506326: Merge "Fix errors during user switching" into mnc-dev
* commit '
51506326d1629ed6e1423c11ff2238c6f19b742f':
Fix errors during user switching
John Spurlock [Tue, 12 May 2015 23:11:36 +0000 (23:11 +0000)]
am
fb9a664b: Merge "Zen: Reset zen + ringer modes on upgrades to M." into mnc-dev
* commit '
fb9a664b2bcb41844f1e00264ff5c5f18956a9fa':
Zen: Reset zen + ringer modes on upgrades to M.
Svetoslav [Tue, 12 May 2015 23:11:22 +0000 (23:11 +0000)]
am
faf55219: Merge "Update permission group descriptions." into mnc-dev
* commit '
faf55219877416c1bdfbdfe5b7d24e35e9971a03':
Update permission group descriptions.
Alex Klyubin [Tue, 12 May 2015 23:11:15 +0000 (23:11 +0000)]
am
4dc54149: Merge "Add missing value for EcIesParameterSpec.PointFormatEnum." into mnc-dev
* commit '
4dc541497dd1b25afb8b0323312800bf80f89eac':
Add missing value for EcIesParameterSpec.PointFormatEnum.
Alex Klyubin [Tue, 12 May 2015 23:11:10 +0000 (23:11 +0000)]
am
09b15d5b: Merge "Add NonNull and Nullable annotations to AndroidKeyStore API." into mnc-dev
* commit '
09b15d5bdb2eebc5e63889297789c15e97fa24b5':
Add NonNull and Nullable annotations to AndroidKeyStore API.
Adam Powell [Tue, 12 May 2015 23:10:55 +0000 (23:10 +0000)]
am
5fccffd5: Merge "Bringing new Chooser UI closer to spec" into mnc-dev
* commit '
5fccffd573395bbd21c477f064de7c25100c3f8a':
Bringing new Chooser UI closer to spec
Miao Wang [Tue, 12 May 2015 23:10:47 +0000 (23:10 +0000)]
am
d6f3ebf1: Merge "[RenderScript] (minor) fix validation of L3 BLAS" into mnc-dev
* commit '
d6f3ebf1d0aa940d6c7edc2660f65db453e11718':
[RenderScript] (minor) fix validation of L3 BLAS
Alex Klyubin [Tue, 12 May 2015 23:10:33 +0000 (23:10 +0000)]
am
e1176f10: Merge "Fix KeyStoreTest now that begin requires parameters." into mnc-dev
* commit '
e1176f10eba5a65ad23877b210e4d8d886653e6e':
Fix KeyStoreTest now that begin requires parameters.
John Reck [Tue, 12 May 2015 23:10:26 +0000 (23:10 +0000)]
am
30e175c8: Merge "Clarify assert" into mnc-dev
* commit '
30e175c8bee47bb2b840f16e28b9460a3ceaeeef':
Clarify assert
Jeff Davidson [Tue, 12 May 2015 23:10:09 +0000 (23:10 +0000)]
am
0a775ce9: Ensure VPN consent is not revoked in prepare/establish.
* commit '
0a775ce9801f03071d1e9bcc177d79e6fe350702':
Ensure VPN consent is not revoked in prepare/establish.
Chirag Shah [Tue, 12 May 2015 23:09:58 +0000 (23:09 +0000)]
am
3ce72722: Merge "Revert the AssistAction class." into mnc-dev
* commit '
3ce72722ca14ad9e84ca54920bb2829696f68d53':
Revert the AssistAction class.
Jean-Michel Trivi [Tue, 12 May 2015 23:09:54 +0000 (23:09 +0000)]
am
3b12261c: Merge "android.media.AudioRecord.Builder: no "capture preset"" into mnc-dev
* commit '
3b12261c50851deedef64974a05a8cbff2b4c2ea':
android.media.AudioRecord.Builder: no "capture preset"
Mady Mellor [Tue, 12 May 2015 23:09:49 +0000 (23:09 +0000)]
am
15445a65: Merge "Provide a way for a stylus to access the quick settings menu" into mnc-dev
* commit '
15445a652bfca60d67fc95df8c80f529f8e42979':
Provide a way for a stylus to access the quick settings menu
John Spurlock [Tue, 12 May 2015 23:09:44 +0000 (23:09 +0000)]
am
b7c9b225: Merge "QS: Defer tile view updates when opening the detail panel." into mnc-dev
* commit '
b7c9b2259f1976e2fd25771aa9ca3dd8f3afa335':
QS: Defer tile view updates when opening the detail panel.
George Mount [Tue, 12 May 2015 23:09:36 +0000 (23:09 +0000)]
am
3dec0d47: Merge "Disable input during Activity Transition." into mnc-dev
* commit '
3dec0d47215b56e3bd3e6f3287cf2c966bf8c22f':
Disable input during Activity Transition.
John Reck [Tue, 12 May 2015 23:09:29 +0000 (23:09 +0000)]
am
78fad572: Merge "Add a few missing asserts" into mnc-dev
* commit '
78fad5724d0210f85b6688ef2eec9859d2b92601':
Add a few missing asserts
Jason Monk [Tue, 12 May 2015 23:09:24 +0000 (23:09 +0000)]
am
d567d88e: Merge "SettingsLib: Do wifi processing in background" into mnc-dev
* commit '
d567d88e1017e45e2ccecea812fd53122c1b9ce0':
SettingsLib: Do wifi processing in background
Zoltan Szatmary-Ban [Tue, 12 May 2015 23:09:14 +0000 (23:09 +0000)]
am
11a1086f: Merge "Improve javadoc on android.permission.PACKAGE_USAGE_STATS" into mnc-dev
* commit '
11a1086f69abafc17e4fc6db38622d126a1a7ecc':
Improve javadoc on android.permission.PACKAGE_USAGE_STATS
Steve McKay [Tue, 12 May 2015 23:09:08 +0000 (23:09 +0000)]
am
b3100f4b: Merge "Delete StandaloneActivity from M (DO NOT MERGE)" into mnc-dev
* commit '
b3100f4b13159deb0b5736aedca1659dfe3c762b':
Delete StandaloneActivity from M (DO NOT MERGE)
John Spurlock [Tue, 12 May 2015 23:08:58 +0000 (23:08 +0000)]
am
13ea79de: Merge "Volume: Separate tint colors for active vs inactive sliders." into mnc-dev
* commit '
13ea79dea443831c1936f9ac47109144705149f6':
Volume: Separate tint colors for active vs inactive sliders.
Geoff Mendal [Tue, 12 May 2015 23:08:53 +0000 (23:08 +0000)]
am
7846d966: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
7846d966f5b0d78fa819b56d45be3b668f34dcfb':
Import translations. DO NOT MERGE
OSDN Git Service
