git.osdn.net Git - android-x86/frameworks-base.git/log

Christoph Studer [Tue, 16 Sep 2014 00:06:31 +0000 (00:06 +0000)]

am c91e1ede: am 6e68dff3: Merge "NoLiService: Delete @removed meetsInterruptionFilter" into lmp-dev

* commit 'c91e1ede413bcd48b11efb75706ffdfee684b3f1':

commit | commitdiff | tree

Christoph Studer [Tue, 16 Sep 2014 00:06:27 +0000 (00:06 +0000)]

am 4a32be20: am c4290acf: Merge "Notification: Use ViewStub for ProgressBar" into lmp-dev

* commit '4a32be200536fa8c288780099dafb8e46dc6aabc':

commit | commitdiff | tree

Adam Connors [Tue, 16 Sep 2014 00:06:21 +0000 (00:06 +0000)]

am d0b63c2e: am 5e1fe70f: Merge "Add feature flags for verified boot and securely remove users." into lmp-dev

* commit 'd0b63c2e5651046fd8912617970acf88836e0003':

commit | commitdiff | tree

Yohei Yukawa [Tue, 16 Sep 2014 00:06:17 +0000 (00:06 +0000)]

am d40d546b: am 107505bd: Merge "Use public APIs to instantiate InputMethodSubtype" into lmp-dev

* commit 'd40d546b07fbc2a8c1bbc4d2d558445fb1351d3f':

commit | commitdiff | tree

Jessica Hummel [Tue, 16 Sep 2014 00:06:09 +0000 (00:06 +0000)]

am 4cc406c5: am 1e4efc91: Merge "Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager." into lmp-dev

* commit '4cc406c5dd50a2bf39c8c7536832cf5b1964237d':

commit | commitdiff | tree

Vinit Deshpande [Tue, 16 Sep 2014 00:06:03 +0000 (00:06 +0000)]

am 93ba8031: am 8270c789: Merge "Secure access to WifiScanner" into lmp-dev

* commit '93ba8031cd8e0ca9f85561eaaf6c70c0353641e2':

commit | commitdiff | tree

Zhijun He [Tue, 16 Sep 2014 00:05:56 +0000 (00:05 +0000)]

am 55f43bf9: am 5ef21e48: Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev

* commit '55f43bf952073e1e38fd8361aad200c851b7b849':

commit | commitdiff | tree

Eric Rowe [Tue, 16 Sep 2014 00:05:51 +0000 (00:05 +0000)]

am 1cde98e9: am 9c8a45b5: Merge "Allow protected wifi in connectivity tests" into lmp-dev

* commit '1cde98e9d35fd13f46af53b6424e5e01b60532b1':

commit | commitdiff | tree

Lajos Molnar [Tue, 16 Sep 2014 00:05:47 +0000 (00:05 +0000)]

am 20727825: am 4f276471: Merge "MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo" into lmp-dev

* commit '20727825b26c3a026bd710ae18d27e16f63415f4':

commit | commitdiff | tree

Robert Shih [Tue, 16 Sep 2014 00:05:42 +0000 (00:05 +0000)]

am 8d2889ae: am 3b0b5ce3: MediaPlayer/SubtitleController:fix add/select timed text on start

* commit '8d2889aeb835d6429875cfe3a6cc1d8cd179a71b':

commit | commitdiff | tree

Wink Saville [Tue, 16 Sep 2014 00:05:36 +0000 (00:05 +0000)]

am b5942450: Rename answerRingingCallUsingSubId to answrRingingCallForSubscriber.

* commit 'b5942450f1c2e873862c3f188a7b116d4164e15e':
Rename answerRingingCallUsingSubId to answrRingingCallForSubscriber.

commit | commitdiff | tree

Wink Saville [Tue, 16 Sep 2014 00:05:28 +0000 (00:05 +0000)]

am b16447cb: Update current.txt for two renamed methods.

* commit 'b16447cb7d1463b2f7f182d2cbbd740ee855d95e':
Update current.txt for two renamed methods.

commit | commitdiff | tree

Alan Viverette [Tue, 16 Sep 2014 00:05:21 +0000 (00:05 +0000)]

am b41916f1: am a9962d36: Merge "Improve dialog padding when title or body text are missing" into lmp-dev

* commit 'b41916f1f46b41d3a36a9c6527e950e121826fd1':

commit | commitdiff | tree

Eric Laurent [Tue, 16 Sep 2014 00:05:15 +0000 (00:05 +0000)]

am a00a01e9: am 4f0149fe: Merge "SoundTriggerHelper: handle media server death" into lmp-dev

* commit 'a00a01e98b989a302efb0c241aca03867a500b36':

commit | commitdiff | tree

Junda Liu [Tue, 16 Sep 2014 00:05:10 +0000 (00:05 +0000)]

am eb17ac08: am bdf9cf90: Add ForSubscriber suffix to APIs w/ subId argument.

* commit 'eb17ac08d60bb7bbd8f8235ae43713d13bdb0a3b':

commit | commitdiff | tree

Dianne Hackborn [Tue, 16 Sep 2014 00:05:05 +0000 (00:05 +0000)]

am b5186a1e: am 829b79f6: Merge "Fix build." into lmp-dev

* commit 'b5186a1e5f281c827f337e14cc998c0714d16014':

commit | commitdiff | tree

Amit Mahajan [Tue, 16 Sep 2014 00:05:01 +0000 (00:05 +0000)]

am 238687d2: am 7cd6fc5b: Merge "Support to load default voicemail number from the configuration." into lmp-dev

* commit '238687d23c7df9f1f4f370ff4b07b08f1d5ed4d1':

commit | commitdiff | tree

wsmlby [Tue, 16 Sep 2014 00:04:56 +0000 (00:04 +0000)]

am 92886119: am d1ed1e81: Merge "Fix AppCompatibility test for different process name of one package." into lmp-dev

* commit '928861193378e9f9dc35bb856c050ec3ba839866':

commit | commitdiff | tree

Jinsuk Kim [Tue, 16 Sep 2014 00:04:50 +0000 (00:04 +0000)]

am 8585fb95: am a8c43b25: Merge "CEC: Stub MHL Controller" into lmp-dev

* commit '8585fb956870ba191778ffa485e294cdf006d7f0':

commit | commitdiff | tree

Robert Ly [Tue, 16 Sep 2014 00:04:30 +0000 (00:04 +0000)]

am 53f6e1b2: am bb6ede49: am 0cb4c738: am 9f60bc3f: am 52a18161: docs: update api dashboard for september

* commit '53f6e1b2fb51083ac4d1bd2945fbf5fc5fe6c391':

commit | commitdiff | tree

Jeff Tinker [Tue, 16 Sep 2014 00:04:23 +0000 (00:04 +0000)]

am e169cdca: am 50bb6215: Merge "Add support for max-res decode" into lmp-dev

* commit 'e169cdcae09617620f4036824c2899b81e635549':

commit | commitdiff | tree

Adam Lesinski [Tue, 16 Sep 2014 00:04:18 +0000 (00:04 +0000)]

am ed541068: am 38bd55ff: Merge changes I79ba54d7,I224fb4b6 into lmp-dev

* commit 'ed541068f5287d5bdb0e5f3ce6a59e711c84276c':

commit | commitdiff | tree

Tsuwei Chen [Tue, 16 Sep 2014 00:04:11 +0000 (00:04 +0000)]

am da620305: am 5675ab1b: Merge "Move carrier-specific GPS parameters out of framework/base directory. Bug: 17288144" into lmp-dev

* commit 'da620305a0f9f7ea4b6c60e444c785404580aac6':

commit | commitdiff | tree

Adam Lesinski [Tue, 16 Sep 2014 00:04:03 +0000 (00:04 +0000)]

am 944ce725: am 799dc748: Merge "AAPT: Don\'t crash on illegal symbol name" into lmp-dev

* commit '944ce725351ac264cd58149a00716c174778ed15':

commit | commitdiff | tree

Alan Viverette [Tue, 16 Sep 2014 00:03:54 +0000 (00:03 +0000)]

am f2fa6076: am b7afde5c: Merge "Bring up the IME when TextView receives ACTION_CLICK" into lmp-dev

* commit 'f2fa6076801abbc15b7ac25a84aabf2e02290251':

commit | commitdiff | tree

Adam Powell [Tue, 16 Sep 2014 00:03:45 +0000 (00:03 +0000)]

am 483ef8d4: am 8197da77: Merge "ActionMenuViews always reserve overflow when creating their own menus" into lmp-dev

* commit '483ef8d45919262e1e60b114fdcdc8f463cb20ff':

commit | commitdiff | tree

Christopher Tate [Tue, 16 Sep 2014 00:03:40 +0000 (00:03 +0000)]

am b2f1b76c: am 3b9417ff: Merge "Fix BackupManager.isBackupEnabled()" into lmp-dev

* commit 'b2f1b76c153797887f3b02267c8f5e81c912715a':

commit | commitdiff | tree

Winson Chung [Tue, 16 Sep 2014 00:03:34 +0000 (00:03 +0000)]

am 210f61fe: am b68c78bd: Announcing the task list as you scroll. (Bug 15699050)

* commit '210f61fedd22bae291193775222838c00bd033b5':

commit | commitdiff | tree

Winson Chung [Tue, 16 Sep 2014 00:03:26 +0000 (00:03 +0000)]

am dcbc51ec: am 5ec5fa49: Fixing issue with Recents showing blank. (Bug 16987565)

* commit 'dcbc51ec39e3d4e14199aee3f9c32bb0af71bee9':

commit | commitdiff | tree

Winson Chung [Tue, 16 Sep 2014 00:03:19 +0000 (00:03 +0000)]

am bf7d37ce: am d7a863be: Fixing issue with touch events not being forwarded to task switch fling detector. (Bug 16656169)

* commit 'bf7d37ce785a85504d7ab93c1a090f9ca30c261c':

commit | commitdiff | tree

Winson Chung [Tue, 16 Sep 2014 00:03:08 +0000 (00:03 +0000)]

am ee169c78: am 7d631483: Adding task switching animation xmls for further tweaking. (Bug 16656169)

* commit 'ee169c78e7e7a63f9728891cb9ecc753fa490a5c':

commit | commitdiff | tree

Winson Chung [Tue, 16 Sep 2014 00:03:04 +0000 (00:03 +0000)]

am e1e8f45f: am b754940a: Fixing weird highlight on dismiss button ripple. (Bug 17420495)

* commit 'e1e8f45f892cfa4c18ee97b215337e7029f10f4f':

commit | commitdiff | tree

Jeff Sharkey [Tue, 16 Sep 2014 00:02:59 +0000 (00:02 +0000)]

am 966223fd: am c5d4ebd6: Merge "Missing manifest error should be NO_CERTIFICATES." into lmp-dev

* commit '966223fd1a7f060336b798a41edd8028475a312d':

commit | commitdiff | tree

Yin-Chia Yeh [Tue, 16 Sep 2014 00:02:55 +0000 (00:02 +0000)]

am 7abe962d: am 916d8faf: Merge "camera2: make 3A regions null when not available" into lmp-dev

* commit '7abe962d9cfda3625a27e832b9a245dffaf21db9':

commit | commitdiff | tree

Eino-Ville Talvala [Tue, 16 Sep 2014 00:02:50 +0000 (00:02 +0000)]

am 886271da: am 28312293: Merge "Camera2: Add frameNumber to CaptureCallback#onCaptureStarted" into lmp-dev

* commit '886271da501683b61c0df19afef9dd4c19876efe':

commit | commitdiff | tree

vandwalle [Tue, 16 Sep 2014 00:02:45 +0000 (00:02 +0000)]

am 0b6f830a: am 5e811150: Merge "make autojoin associated scan period a config opttion" into lmp-dev

* commit '0b6f830a6f9b2bfa410728f36fc518f96a8360ee':

commit | commitdiff | tree

Svetoslav [Tue, 16 Sep 2014 00:02:41 +0000 (00:02 +0000)]

am eac0cdfb: am 3f49b128: Merge "Trim unnecessary pages when printing." into lmp-dev

* commit 'eac0cdfb4fbcfaeabcc49a423f0e205d5c509cdd':

commit | commitdiff | tree

Lajos Molnar [Tue, 16 Sep 2014 00:02:36 +0000 (00:02 +0000)]

am 34c4f98e: am adbca3e5: Merge "initialize codec list before MediaCodec.getCodecInfo()" into lmp-dev

* commit '34c4f98e47db08172f02a34074dde1580bc7d4d3':

commit | commitdiff | tree

Guang Zhu [Tue, 16 Sep 2014 00:02:32 +0000 (00:02 +0000)]

am ce5d14ab: am a3cd7592: Merge "add some assert messages to download manager test" into lmp-dev

* commit 'ce5d14ab6f7fc37351c3f2489f37ec39ebfcab79':

commit | commitdiff | tree

John Spurlock [Tue, 16 Sep 2014 00:02:27 +0000 (00:02 +0000)]

am 318811ef: am 7fa27583: Merge "QS: Fix tile padding on dual tile first lines." into lmp-dev

* commit '318811ef9c9f8d9fb296e6081a1be60b50b60185':

commit | commitdiff | tree

Alan Viverette [Tue, 16 Sep 2014 00:02:22 +0000 (00:02 +0000)]

am 94aa3233: am ba2ce6fa: Merge "Update alert dialog styling to match Material spec" into lmp-dev

* commit '94aa32338b598abb73be5f96f2f57ed36257fb6e':

commit | commitdiff | tree

Philip Milne [Tue, 16 Sep 2014 00:02:14 +0000 (00:02 +0000)]

am 95cce6cd: am 2a95b928: Fix for b/16400888 - API Review: GridLayout attributes

* commit '95cce6cdf3a806f0123c68b351519729bf1ebb59':

commit | commitdiff | tree

John Spurlock [Tue, 16 Sep 2014 00:02:04 +0000 (00:02 +0000)]

am ddfc7d58: am 0b7a5768: Merge "On db upgrade, reset ringer mode to normal." into lmp-dev

* commit 'ddfc7d581b6d3a6cc1787ff7a207a0457ccc6024':

commit | commitdiff | tree

Jean-Michel Trivi [Mon, 15 Sep 2014 21:31:48 +0000 (21:31 +0000)]

am ac6709cc: am 013279ac: Merge "Prevent NotificationManagerService from using bad stream type" into lmp-dev

* commit 'ac6709cc5de58d6259036bc28f675386443573c6':

commit | commitdiff | tree

John Spurlock [Mon, 15 Sep 2014 21:31:39 +0000 (21:31 +0000)]

am 29aa3fce: am cdc2b578: Merge "Zen: Map transition to ringer-mode silent to "priority"." into lmp-dev

* commit '29aa3fce822d57d4383c65c88573f8093c4d9d42':

commit | commitdiff | tree

Amith Yamasani [Mon, 15 Sep 2014 21:31:31 +0000 (21:31 +0000)]

am 3477dfe5: am 7a9f541e: Merge "User restriction to disallow outgoing NFC beam" into lmp-dev

* commit '3477dfe59786a4c9272b478e8bf85d79811a22fb':

commit | commitdiff | tree

Jeff Sharkey [Mon, 15 Sep 2014 21:31:23 +0000 (21:31 +0000)]

am 8279d5b7: am b8d727ec: Merge "Use sscanf() for parsing tag values." into lmp-dev

* commit '8279d5b710758cac4edbb9cc891ef1f2ea5da1f5':

commit | commitdiff | tree

John Spurlock [Mon, 15 Sep 2014 21:31:13 +0000 (21:31 +0000)]

am 39412e15: am d09f0b6b: Merge "Doze: Wake up on touch, fade between states." into lmp-dev

* commit '39412e1572729b206a24ee2a5b8372deff1bb1db':

commit | commitdiff | tree

Chris Craik [Mon, 15 Sep 2014 21:31:06 +0000 (21:31 +0000)]

am 3109db91: am e46cfca2: Merge "hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D" into lmp-dev

* commit '3109db91ff1f33eb8092978c30bf0bc0ef4e25d1':

commit | commitdiff | tree

Riley Andrews [Mon, 15 Sep 2014 21:31:02 +0000 (21:31 +0000)]

am eba21aea: am 4b7c14bf: Merge "Use surfaceflinger for recents thumbnail rotations." into lmp-dev

* commit 'eba21aeae7134468ce5fe6193901f7ddf712be13':

commit | commitdiff | tree

Alan Viverette [Mon, 15 Sep 2014 21:30:57 +0000 (21:30 +0000)]

am d5b20ce3: am e74dff14: Merge "Use correct row/column order in list and grid CollectionItems" into lmp-dev

* commit 'd5b20ce3b3ed3aa5ad029a0e7c77c3a83d766009':

commit | commitdiff | tree

Wink Saville [Mon, 15 Sep 2014 21:30:52 +0000 (21:30 +0000)]

am 78a04d06: Unhide SubscriptionManager and SubInfoRecord

* commit '78a04d069fe0438cdb324cb94351ff79fa2f48cf':
Unhide SubscriptionManager and SubInfoRecord

commit | commitdiff | tree

Griff Hazen [Mon, 15 Sep 2014 21:30:47 +0000 (21:30 +0000)]

am 9dcdb7e2: am df35ac5f: Merge "Remove reference to StatusBarNotification after the value is accessed." into lmp-dev

* commit '9dcdb7e2f7a83c7d0c59048b989556de5c5d7dc7':

commit | commitdiff | tree

Chris Craik [Mon, 15 Sep 2014 21:30:42 +0000 (21:30 +0000)]

am e4f41a18: am c9071002: Merge "Fix tessellation bounds computation" into lmp-dev

* commit 'e4f41a182e3f960e522c5e4dcee0db3f594a1b1b':

commit | commitdiff | tree

Winson Chung [Mon, 15 Sep 2014 21:30:38 +0000 (21:30 +0000)]

am f376621d: am 3d0581d0: Merge "Fixing issue with screen pinning not working. (Bug 17436123)" into lmp-dev

* commit 'f376621d3e3cfd64e9d8c5fe1bb0e9776faa8852':

commit | commitdiff | tree

Winson Chung [Mon, 15 Sep 2014 21:30:33 +0000 (21:30 +0000)]

am 1e71eb53: am 2d6118a1: Merge "Separating the notion of transposed search vs nav bar. (Bug 17402331)" into lmp-dev

* commit '1e71eb531a20b53be5b34d8ca05bb8ce1d1aa454':

commit | commitdiff | tree

Griff Hazen [Mon, 15 Sep 2014 21:30:28 +0000 (21:30 +0000)]

am 49338385: am c06b7a78: Copy visibility docs from support version to base Notification.

* commit '49338385cc587f27b41003b6cd11623bfe0972ce':

commit | commitdiff | tree

Jason Monk [Mon, 15 Sep 2014 21:30:24 +0000 (21:30 +0000)]

am c3d8e4f5: am 76779dbc: Merge "Add user-specific playSoundEffect and use in NavBar" into lmp-dev

* commit 'c3d8e4f575a5ce1837da15bccb9c5c30034b2e8d':

commit | commitdiff | tree

Vineeta Srivastava [Mon, 15 Sep 2014 21:30:19 +0000 (21:30 +0000)]

am 728d051f: am a66c2cd1: Merge "Set MTU size to 1410 for Telus." into lmp-dev

* commit '728d051f2b0f2ecc6834186f3eec25dda4941fe1':

commit | commitdiff | tree

Alexandra Gherghina [Mon, 15 Sep 2014 21:30:14 +0000 (21:30 +0000)]

am 18d7ec36: am c3b392d0: Merge "Removing the NO_CROSS_PROFILE flag for intent forwarding" into lmp-dev

* commit '18d7ec369972d04494c84f476faaefcb1d3762a0':

commit | commitdiff | tree

Wink Saville [Mon, 15 Sep 2014 21:30:09 +0000 (21:30 +0000)]

am bdfbdc85: am 5dac65ad: Change suffix UsingSubId to ForSubscriber.

* commit 'bdfbdc856c74b3fe7faf1c27d51f20e3422cfa62':

commit | commitdiff | tree

Griff Hazen [Mon, 15 Sep 2014 21:30:02 +0000 (21:30 +0000)]

am 6279b886: am b0e0f2f6: Merge "Add support for a circular bitmap overlay for round android wear emulator." into lmp-dev

* commit '6279b886392a93134d758e2a403f00884698bfed':

commit | commitdiff | tree

Jae Seo [Mon, 15 Sep 2014 21:29:53 +0000 (21:29 +0000)]

am 2f1c80ae: am e188fc30: Merge "Add Japanese content ratings" into lmp-dev

* commit '2f1c80ae10f34866ca273cac372e1eda3e33c935':

commit | commitdiff | tree

Craig Mautner [Mon, 15 Sep 2014 21:29:44 +0000 (21:29 +0000)]

am c7e61109: am 77e1dc74: Merge "Remove deprecated (and now unused) API method." into lmp-dev

* commit 'c7e6110956d33b604d8e9bf9d29cd9893c718f88':

commit | commitdiff | tree

Dianne Hackborn [Mon, 15 Sep 2014 21:29:36 +0000 (21:29 +0000)]

am d2c9aa82: am 0ad9e247: Merge "Add new wallpaper features for insets and offsets." into lmp-dev

* commit 'd2c9aa82bbf119eb2c68254692f820f3190f3d40':

commit | commitdiff | tree

Adrian Roos [Mon, 15 Sep 2014 21:29:30 +0000 (21:29 +0000)]

am 8a3d0b0d: am 08b3499c: Merge "Initilize LockPatternUtils with the current user" into lmp-dev

* commit '8a3d0b0d1edab356bff0a37b77e8293c0898d424':

commit | commitdiff | tree

Adrian Roos [Mon, 15 Sep 2014 21:29:25 +0000 (21:29 +0000)]

am 3d9f8d66: am c60d7426: Merge "Show confirmation dialog when adding user from QS" into lmp-dev

* commit '3d9f8d663d8b00a8d8f8ae43950acfa25c4b8fd4':

commit | commitdiff | tree

Adrian Roos [Mon, 15 Sep 2014 21:29:20 +0000 (21:29 +0000)]

am 871536e9: am dda9415e: Merge "Don\'t draw system bar backgrounds if FLAG_FULLSCREEN is set" into lmp-dev

* commit '871536e99c3f24fa9b3f4ffd57f821b724c8e889':

commit | commitdiff | tree

Adrian Roos [Mon, 15 Sep 2014 21:29:15 +0000 (21:29 +0000)]

am 15a6b9b7: am eb578566: Merge "Don\'t crash if there\'s no QS panel" into lmp-dev

* commit '15a6b9b751ecc127e4977b2b704eecd6e0b0357a':

commit | commitdiff | tree

Jorim Jaggi [Mon, 15 Sep 2014 21:29:10 +0000 (21:29 +0000)]

am b9108d5b: am bc6542cc: Merge "Remove a few unnecessary withLayer() calls" into lmp-dev

* commit 'b9108d5bdd201677242bd882d7e4359115014184':

commit | commitdiff | tree

Jorim Jaggi [Mon, 15 Sep 2014 21:29:06 +0000 (21:29 +0000)]

am e7cbb85c: am 71d150d2: Merge "Fix padding between R and wifi icon" into lmp-dev

* commit 'e7cbb85ca1a2a7147c1edd7de489d81a31aeccb0':

commit | commitdiff | tree

Selim Cinek [Mon, 15 Sep 2014 21:28:59 +0000 (21:28 +0000)]

am 93312cc3: am edf8bc9b: Merge "Fixed a bug that the icon was not animating anymore when updating." into lmp-dev

* commit '93312cc37494c8abef20abb521af2e871a604411':

commit | commitdiff | tree

Selim Cinek [Mon, 15 Sep 2014 21:28:55 +0000 (21:28 +0000)]

am 6564d6dd: am 9e58d85f: Merge "Properly announcing HUN state for talkback" into lmp-dev

* commit '6564d6dd779e38115d3c9767081941b7c8bc9e79':

commit | commitdiff | tree

Selim Cinek [Mon, 15 Sep 2014 21:28:50 +0000 (21:28 +0000)]

am 982d44ff: am f844d519: Merge "Avoiding heads-up when accessibility is turned on" into lmp-dev

* commit '982d44ffa4f640c208dce9ce0d9b4b9da724494f':

commit | commitdiff | tree

Jorim Jaggi [Mon, 15 Sep 2014 21:28:45 +0000 (21:28 +0000)]

am 7e5fc93d: am bd8dc855: Merge "Do not dim the non-activated notifications on lockscreen" into lmp-dev

* commit '7e5fc93d39889944b7510c51973ff6c2313fb4ba':

commit | commitdiff | tree

Jorim Jaggi [Mon, 15 Sep 2014 21:28:40 +0000 (21:28 +0000)]

am 9d6a3a69: am cc597c82: Merge "Apply color to auto-redacted notification" into lmp-dev

* commit '9d6a3a6939c31ec2194399bbe44ae013d3a2f6f2':

commit | commitdiff | tree

Zoltan Szatmary-Ban [Mon, 15 Sep 2014 21:28:30 +0000 (21:28 +0000)]

am 042e2ff5: am 1bb79472: Merge "Extend IKeyChainService AIDL with CACert retrieval" into lmp-dev

* commit '042e2ff550efc73ba8579a2fba972dc07dc80e89':

commit | commitdiff | tree

Paul Jensen [Mon, 15 Sep 2014 21:28:18 +0000 (21:28 +0000)]

am 9ed16b9c: am 2ea21f45: Merge "Stop logging false error when lingering completes." into lmp-dev

* commit '9ed16b9c2eb8e4a769199c2c555346afe81d0794':

commit | commitdiff | tree

Paul Jensen [Mon, 15 Sep 2014 21:28:07 +0000 (21:28 +0000)]

am ba8f085d: am 61892299: Merge "Don\'t send listening NetworkRequests to NetworkFactories." into lmp-dev

* commit 'ba8f085d09a5e13fce913446bbdca67b8b95f34a':

commit | commitdiff | tree

Paul Jensen [Mon, 15 Sep 2014 21:27:57 +0000 (21:27 +0000)]

am 45ea12a4: am 6801c1b7: Merge "Implement ConnectivityManager.reportBadNetwork() to trigger network validation." into lmp-dev

* commit '45ea12a45b4535b218c202976fcc9279c0d25b1b':

commit | commitdiff | tree

Selim Cinek [Mon, 15 Sep 2014 21:27:46 +0000 (21:27 +0000)]

am 1b97ea53: am 71f55d23: Merge "Announcing the stream type when the volume panel comes up" into lmp-dev

* commit '1b97ea53c1dd740a397925274e7a910c07e35857':

commit | commitdiff | tree

Selim Cinek [Mon, 15 Sep 2014 21:27:37 +0000 (21:27 +0000)]

am b4b08afe: am b9a2c1f7: Merge "Fixed a bug with the anti-falsing logic with dismissing" into lmp-dev

* commit 'b4b08afee7d4437128dae3466e47392ecb63e4b5':

commit | commitdiff | tree

Nicolas Prevot [Mon, 15 Sep 2014 21:27:28 +0000 (21:27 +0000)]

am 9357eb6d: am 7d1d9f77: Merge "Allowing a ContentProvider to have a null authority." into lmp-dev

* commit '9357eb6dfa4ae52393486325153978d5f32b263d':

commit | commitdiff | tree

Yohei Yukawa [Mon, 15 Sep 2014 21:27:23 +0000 (21:27 +0000)]

am 8a3a855f: am dcab9fad: Follow up API signature changes of CursorAnchorInfo part 2

* commit '8a3a855f85f9e5412d1ba3a4522b84470af9c1ff':

commit | commitdiff | tree

Michael Wright [Mon, 15 Sep 2014 21:27:18 +0000 (21:27 +0000)]

am 071d5fdb: am f71585f6: Merge "Use new device identifier to check if a layout has been set." into lmp-dev

* commit '071d5fdb5fa9510c26d9ad23367c20a3b3aa0668':

commit | commitdiff | tree

Adam Powell [Mon, 15 Sep 2014 21:27:13 +0000 (21:27 +0000)]

am b2fe290f: am d6fa07e7: Merge "New new design for ResolverActivity" into lmp-dev

* commit 'b2fe290f3f5652b87ed6f950b19602dcfbaf834f':

commit | commitdiff | tree

Deepanshu Gupta [Mon, 15 Sep 2014 21:27:09 +0000 (21:27 +0000)]

am b37aac76: am c52a1286: Merge "Build layoutlib create tests as part of sdk build." into lmp-dev

* commit 'b37aac76800948a6990ca43c852c4bd3419b64ec':

commit | commitdiff | tree

Eric Laurent [Mon, 15 Sep 2014 21:27:04 +0000 (21:27 +0000)]

am 7e32ec61: am 602e21fa: Merge "unhide AudioAttributes flag FLAG_HW_AV_SYNC" into lmp-dev

* commit '7e32ec61f10add62239b1053eff8107d2c42835c':

commit | commitdiff | tree

Jean-Luc Brouillet [Mon, 15 Sep 2014 21:26:59 +0000 (21:26 +0000)]

am 7ac916ee: am 20f2fa31: Merge "Fix rsMatrix documentation." into lmp-dev

* commit '7ac916eebf1f555e72fc613cef091f4d3aa34924':

commit | commitdiff | tree

Vinit Deshpande [Mon, 15 Sep 2014 21:26:54 +0000 (21:26 +0000)]

am 763f89f3: am fc591cc1: Merge "Implement getAvailableChannels" into lmp-dev

* commit '763f89f393915a52031c0e841b941e05b95c4014':

commit | commitdiff | tree

Andreas Gampe [Mon, 15 Sep 2014 21:26:49 +0000 (21:26 +0000)]

am 909eb79f: am cd74e05a: Merge "Frameworks/base: Add native bridge post-fork initialization" into lmp-dev

* commit '909eb79f0970c1bb5f84b0a980f5df22f75e0b47':

commit | commitdiff | tree

Deepanshu Gupta [Mon, 15 Sep 2014 21:26:45 +0000 (21:26 +0000)]

am b9ba9f4f: am 1d39bab7: Merge "Update IntelliJ project file for IntelliJ 14" into lmp-dev

* commit 'b9ba9f4f330920b179d366dfb9a4244000eaddd8':

commit | commitdiff | tree

Deepanshu Gupta [Mon, 15 Sep 2014 21:26:40 +0000 (21:26 +0000)]

am 95760760: am 45997e76: Merge "Add layoutlib tests to DIST_DIR" into lmp-dev

* commit '9576076031a216752783dd1140d78054948912dd':

commit | commitdiff | tree

Deepanshu Gupta [Mon, 15 Sep 2014 21:26:35 +0000 (21:26 +0000)]

am 5a0dffdc: am f86fe4a8: Merge "Remove warning for null entries in resource array." into lmp-dev

* commit '5a0dffdc31a272bff79ab64382ad609dc66e29ae':

commit | commitdiff | tree

Dirk Dougherty [Mon, 15 Sep 2014 21:26:31 +0000 (21:26 +0000)]

am e80a397c: am f73b4f5e: am d87e0484: am 604ae4c7: am 552e5ce6: Merge "Doc change: Add note to use explicit intent when binding to billing service." into klp-modular-docs

* commit 'e80a397c607a9685b512339c9b05df3c7bac438c':

commit | commitdiff | tree

Michael Wright [Mon, 15 Sep 2014 21:26:26 +0000 (21:26 +0000)]

am 7be41e98: am 1c5d160b: Merge "Add FEATURE_GAMEPAD to current.txt" into lmp-dev

* commit '7be41e98410efd59179d972f073af97578a7770d':

commit | commitdiff | tree

Wink Saville [Mon, 15 Sep 2014 21:26:22 +0000 (21:26 +0000)]

am b310c405: am 26207b53: Merge "Change getCurrentPhoneType to SystemApi" into lmp-dev

* commit 'b310c405defd66ac268bd827cbcbc51e0b35cec2':

commit | commitdiff | tree

Amit Mahajan [Mon, 15 Sep 2014 21:26:17 +0000 (21:26 +0000)]

am 2192bff9: am 034fe21c: Merge "Assisted dialing support of MO SMS" into lmp-dev

* commit '2192bff94e352810cb9b41b9ef537abd8c1a4e7a':

commit | commitdiff | tree

Amit Mahajan [Mon, 15 Sep 2014 21:26:12 +0000 (21:26 +0000)]

am b102cb48: am 1fa77bb5: Merge "change the property name about IDP from \'telephony.\' to \'gsm.\'" into lmp-dev

* commit 'b102cb485e533b31db773278e92b20b65432af83':

commit | commitdiff | tree

Chris Craik [Mon, 15 Sep 2014 21:26:06 +0000 (21:26 +0000)]

am ec72bc5c: am 2d0c82ad: Merge "Don\'t track TextureLayer lifecycles in RenderState" into lmp-dev

* commit 'ec72bc5c69cc68e6e454ea612bab786627e9d105':