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

(root) / android-x86 / frameworks-base.git / log

Jason Sams [Tue, 12 May 2015 21:29:44 +0000 (21:29 +0000)]

am 22f07f89: Merge "Fix Allocation-less launches" into mnc-dev

* commit '22f07f89df69e888ffb9e7b8e498cc8ac5fb282f':
Fix Allocation-less launches

commit | commitdiff | tree

Tim Murray [Tue, 12 May 2015 21:29:32 +0000 (21:29 +0000)]

am a0511081: Merge "Add loop option to hwuitest." into mnc-dev

* commit 'a0511081d037722a89d3d69e7edcd0d0dc6ec965':
Add loop option to hwuitest.

commit | commitdiff | tree

Chris Wren [Tue, 12 May 2015 21:29:15 +0000 (21:29 +0000)]

am 9260cb7f: Merge "count panel open method" into mnc-dev

* commit '9260cb7ffe0845d229a8cfe948b4ba30fe32127b':
count panel open method

commit | commitdiff | tree

Eric Laurent [Tue, 12 May 2015 21:28:56 +0000 (21:28 +0000)]

am b65cd17b: Merge "Implement audio routing callbacks" into mnc-dev

* commit 'b65cd17b0508a5a7afdd92e69437825071a1631b':
Implement audio routing callbacks

commit | commitdiff | tree

Alex Klyubin [Tue, 12 May 2015 21:28:33 +0000 (21:28 +0000)]

am 6223ec12: Merge "Keystore uses 0 for invalid operation handles." into mnc-dev

* commit '6223ec129b256526d8c30920271b2ee3960bcf1f':
Keystore uses 0 for invalid operation handles.

commit | commitdiff | tree

Alan Viverette [Tue, 12 May 2015 21:28:24 +0000 (21:28 +0000)]

am 809d5d7f: Merge "DayNight theme for framework packages" into mnc-dev

* commit '809d5d7fbe20e6c84ea19480efa531af765b792b':
DayNight theme for framework packages

commit | commitdiff | tree

Alan Viverette [Tue, 12 May 2015 21:28:06 +0000 (21:28 +0000)]

am 4d5c20c6: Merge "ListPopupWindow should use window layout type SUB_PANEL" into mnc-dev

* commit '4d5c20c613a6716b14bd8ca3f178672c356a89e5':
ListPopupWindow should use window layout type SUB_PANEL

commit | commitdiff | tree

Jeff Tinker [Tue, 12 May 2015 21:27:57 +0000 (21:27 +0000)]

am 26d955fd: Merge "Clarify wording of MediaCrypto exception "ERROR_NO_KEY"" into mnc-dev

* commit '26d955fd02e0bf3f76c50bceeba4b61598f1a8b2':
Clarify wording of MediaCrypto exception "ERROR_NO_KEY"

commit | commitdiff | tree

Alan Viverette [Tue, 12 May 2015 21:27:48 +0000 (21:27 +0000)]

am 71b0cb04: Merge "Add scroll indicators on View, use in AlertDialog" into mnc-dev

* commit '71b0cb043f410d7f0a7852b2f297124fa9aed0e2':
Add scroll indicators on View, use in AlertDialog

commit | commitdiff | tree

Alan Viverette [Tue, 12 May 2015 21:27:41 +0000 (21:27 +0000)]

am c97b922a: Merge "Fix setting hotspot bounds in a drawable container" into mnc-dev

* commit 'c97b922abae0b66fcbd6138f803c9d8a23024e6e':
Fix setting hotspot bounds in a drawable container

commit | commitdiff | tree

John Spurlock [Tue, 12 May 2015 21:27:33 +0000 (21:27 +0000)]

am 444eda08: Merge "Zen: Calendar tracker should use event availability." into mnc-dev

* commit '444eda0836095f58388456355e80cf3b9b127bf4':
Zen: Calendar tracker should use event availability.

commit | commitdiff | tree

Tyler Gunn [Tue, 12 May 2015 21:27:27 +0000 (21:27 +0000)]

am ed7cbf11: Merge "Change sendSessionModifyRequest VideoProvider API signature." into mnc-dev

* commit 'ed7cbf111f5970ab56e557cd785063068405b563':
Change sendSessionModifyRequest VideoProvider API signature.

commit | commitdiff | tree

Benjamin Franz [Tue, 12 May 2015 21:27:10 +0000 (21:27 +0000)]

am 94fb2024: Merge "Rename functions that disable status bar and keyguard" into mnc-dev

* commit '94fb2024b013522e95a880e02b73886fa7d01222':
Rename functions that disable status bar and keyguard

commit | commitdiff | tree

Brian Colonna [Tue, 12 May 2015 21:27:01 +0000 (21:27 +0000)]

am 0fb5aa65: Merge "Removed unused Face Unlock string" into mnc-dev

* commit '0fb5aa656e45476142c81e0cf3aa0fdd4a16af9f':
Removed unused Face Unlock string

commit | commitdiff | tree

Clara Bayarri [Tue, 12 May 2015 21:26:46 +0000 (21:26 +0000)]

am fbb34dd8: Merge "Allow Floating ActionModes in SearchDialog." into mnc-dev

* commit 'fbb34dd8df7bc89ae972c545130e76c5bbb4176e':
Allow Floating ActionModes in SearchDialog.

commit | commitdiff | tree

Alan Viverette [Tue, 12 May 2015 21:26:11 +0000 (21:26 +0000)]

am 7f76ff39: Merge "Fix checkbox animation end colors" into mnc-dev

* commit '7f76ff39b7d0ac7aa31c9528c179e1a99578c108':
Fix checkbox animation end colors

commit | commitdiff | tree

Adam Lesinski [Tue, 12 May 2015 21:25:56 +0000 (21:25 +0000)]

am c9399a80: Merge "Fix overcounting of mobile radio" into mnc-dev

* commit 'c9399a80448ddc4a01d5a9c3d738f3077f70233c':
Fix overcounting of mobile radio

commit | commitdiff | tree

Rich Slogar [Tue, 12 May 2015 21:25:42 +0000 (21:25 +0000)]

am f1ca5777: am 34e0f640: am 84a67c7d: am 1b5f692d: am 9b4d57e1: Merge "docs: gradle multidex update" into lmp-docs

* commit 'f1ca5777283cd647a629456e163f68376f1415b1':
docs: gradle multidex update

commit | commitdiff | tree

Rich Slogar [Tue, 12 May 2015 21:25:30 +0000 (21:25 +0000)]

am 8bbbbd2a: am b462da9e: am f0ea8f9f: am f77d64dc: am 2f14c38f: Merge "docs: overview link to release notes" into lmp-docs

* commit '8bbbbd2afdbb488cfb81bb6b9f9398e49e34bd96':
docs: overview link to release notes

commit | commitdiff | tree

Rich Slogar [Tue, 12 May 2015 21:25:21 +0000 (21:25 +0000)]

am c98d6ae3: am 48ea7762: am 7e33aa48: am 96d00bb6: am 37ca7773: Merge "docs: translation editor update" into lmp-docs

* commit 'c98d6ae334a055aba7f11c0e49eef2973c8f048b':
docs: translation editor update

commit | commitdiff | tree

Rich Slogar [Tue, 12 May 2015 21:25:07 +0000 (21:25 +0000)]

am 5464b5ca: am cc4a2980: am ffef3b76: am 39b51b49: am 2febf6e0: Merge "docs: memory monitor duplicate paragraph" into lmp-docs

* commit '5464b5ca62f9c8bb7b76872fad74ba0387319fd3':
docs: memory monitor duplicate paragraph

commit | commitdiff | tree

Rich Slogar [Tue, 12 May 2015 21:24:54 +0000 (21:24 +0000)]

am 138ab381: am e12c404a: am 35d7cd40: am d0551fee: Merge "docs: providing resources link" into lmp-mr1-ub-docs

* commit '138ab38141614e28a5936b3cefcfc6607ec30dcf':
docs: providing resources link

commit | commitdiff | tree

John Spurlock [Tue, 12 May 2015 21:24:10 +0000 (21:24 +0000)]

am bc1a2ad8: Merge "Zen: Maintain source filters for both calls and messages." into mnc-dev

* commit 'bc1a2ad8785415d1a4f86b3e477ff16e2e68f795':
Zen: Maintain source filters for both calls and messages.

commit | commitdiff | tree

Chih-Hung Hsieh [Tue, 12 May 2015 21:23:53 +0000 (21:23 +0000)]

am 57bbb8d6: Merge "Remove unused aapt target." into mnc-dev

* commit '57bbb8d6812bcb0813ef2530cef060e5d798033b':
Remove unused aapt target.

commit | commitdiff | tree

Amith Yamasani [Tue, 12 May 2015 21:23:27 +0000 (21:23 +0000)]

am 19343927: Merge "Permission policies are for profile and device owners" into mnc-dev

* commit '19343927c2cce0b8dfdd1df8309ce82c3d39b0d5':
Permission policies are for profile and device owners

commit | commitdiff | tree

Jean-Luc Brouillet [Tue, 12 May 2015 21:23:07 +0000 (21:23 +0000)]

am afa81ed0: am 79f12bb6: am d967fcbe: am e9f17cda: docs: Overhaul of the RenderScript reference documentation.

* commit 'afa81ed0b174eb6b81b811fac5cd5df2edb0f798':
docs: Overhaul of the RenderScript reference documentation.

commit | commitdiff | tree

Selim Cinek [Tue, 12 May 2015 21:22:59 +0000 (21:22 +0000)]

am 6da881ba: Merge "Fixed a measuring bug when the panel was collapsed" into mnc-dev

* commit '6da881ba7d6b2b860770aabcb0daefcde85ece20':
Fixed a measuring bug when the panel was collapsed

commit | commitdiff | tree

Selim Cinek [Tue, 12 May 2015 21:22:51 +0000 (21:22 +0000)]

am 1e139e86: Merge "Enforcing the touchslop now when flinging open before intercepting" into mnc-dev

* commit '1e139e86843b59839f9eb6f88466d152b7e23c03':
Enforcing the touchslop now when flinging open before intercepting

commit | commitdiff | tree

Selim Cinek [Tue, 12 May 2015 21:22:37 +0000 (21:22 +0000)]

am 1690ec8e: Merge "Fixed a bug where the notifications would jump when going to the full shade" into mnc-dev

* commit '1690ec8e72876459da198a7228c6591df321df64':
Fixed a bug where the notifications would jump when going to the full shade

commit | commitdiff | tree

Selim Cinek [Tue, 12 May 2015 21:22:26 +0000 (21:22 +0000)]

am e9194b98: Merge "Extended test to support launching assist above lock screen" into mnc-dev

* commit 'e9194b98a2098a1d94957e4723eaaf7399ecf3be':
Extended test to support launching assist above lock screen

commit | commitdiff | tree

Selim Cinek [Tue, 12 May 2015 21:22:05 +0000 (21:22 +0000)]

am 6329bbce: Merge "The voice assist may now be launched above the lockscreen" into mnc-dev

* commit '6329bbceebc8c0d6de164cb693a828402542fd35':
The voice assist may now be launched above the lockscreen

commit | commitdiff | tree

Etan Cohen [Tue, 12 May 2015 21:21:18 +0000 (21:21 +0000)]

am 9c7ce8b0: Merge "Disable VT over IMS feature." into mnc-dev

* commit '9c7ce8b0fc8e429e2524b346174cb67b59c7e175':
Disable VT over IMS feature.

commit | commitdiff | tree

Jae Seo [Tue, 12 May 2015 21:21:05 +0000 (21:21 +0000)]

am 915389d4: Merge "TIF: Make all the parameters for UNRATED null" into mnc-dev

* commit '915389d4b8626cb35bd752420da5d21ec98c209a':
TIF: Make all the parameters for UNRATED null

commit | commitdiff | tree

Ben Kwa [Tue, 12 May 2015 21:20:30 +0000 (21:20 +0000)]

am e74007de: Merge "Clean up error handling in CopyService." into mnc-dev

* commit 'e74007ded3a34d6aaf7dc4fe7f2c18b04b47de3b':
Clean up error handling in CopyService.

commit | commitdiff | tree

Jorim Jaggi [Tue, 12 May 2015 21:20:21 +0000 (21:20 +0000)]

am 570de1e0: Make sure fingerprint error messages are handled in Keyguard

* commit '570de1e0e903f11ab74b0fd386b17494cd66ff33':
Make sure fingerprint error messages are handled in Keyguard

commit | commitdiff | tree

Chris Craik [Tue, 12 May 2015 21:19:59 +0000 (21:19 +0000)]

am 356b1777: Merge "Cleanup properties" into mnc-dev

* commit '356b1777092e7da3ac5eae0bc94bd21e1cf9319a':
Cleanup properties

commit | commitdiff | tree

John Reck [Tue, 12 May 2015 21:19:39 +0000 (21:19 +0000)]

am d6abbd29: Merge "Dump profile info after running test" into mnc-dev

* commit 'd6abbd29b7f453397036cf602655534bbd6c0430':
Dump profile info after running test

commit | commitdiff | tree

Pavel Zhamaitsiak [Tue, 12 May 2015 21:19:30 +0000 (21:19 +0000)]

am b2e3b744: Merge "WiFi Calling: Show different operator name string in Data usage dialog." into mnc-dev

* commit 'b2e3b74418f7fc09f2610bc5620e748d420b5f87':
WiFi Calling: Show different operator name string in Data usage dialog.

commit | commitdiff | tree

Adrian Roos [Tue, 12 May 2015 21:19:22 +0000 (21:19 +0000)]

am 2b0eaffc: Merge "Hide lockscreen contents from a11y while bouncer is showing" into mnc-dev

* commit '2b0eaffc6264abb4162c089adf7089b4cfee5719':
Hide lockscreen contents from a11y while bouncer is showing

commit | commitdiff | tree

Jorim Jaggi [Tue, 12 May 2015 21:19:16 +0000 (21:19 +0000)]

am 5be4d295: Merge "Only enable fingerprint auth after first regular auth" into mnc-dev

* commit '5be4d295c08614eaf8afd012f90e5c7726bc293e':
Only enable fingerprint auth after first regular auth

commit | commitdiff | tree

John Spurlock [Tue, 12 May 2015 21:19:11 +0000 (21:19 +0000)]

am d5304020: Merge "Volume A11y: Prevent auto-dismiss when feedback enabled." into mnc-dev

* commit 'd5304020b29762ce79d66c1ed3028b0ee30c68ad':
Volume A11y: Prevent auto-dismiss when feedback enabled.

commit | commitdiff | tree

Hiroshi Yamauchi [Tue, 12 May 2015 21:19:06 +0000 (21:19 +0000)]

am 95e6c78f: Merge "Fix binder force gc will block binder thread" into mnc-dev

* commit '95e6c78f3f71850931f69fc562f68e0c46430981':
Fix binder force gc will block binder thread

commit | commitdiff | tree

Prabhakar Thirumoorthy [Tue, 12 May 2015 21:18:58 +0000 (21:18 +0000)]

am 5b402fd8: Merge "Update permissions on memory usage instrumentation" into mnc-dev

* commit '5b402fd8963e4700973597650b6992444ff8ffdd':
Update permissions on memory usage instrumentation

commit | commitdiff | tree

Ben Kwa [Tue, 12 May 2015 21:18:34 +0000 (21:18 +0000)]

am efb70fd8: Merge "Cherry pick beefed-up error handling in the CopyService from DO NOT MERGE" into mnc-dev

* commit 'efb70fd8a0a37ddd08356120fb63ff62694eaea0':
Cherry pick beefed-up error handling in the CopyService from master. DO NOT MERGE

commit | commitdiff | tree

Andrew Solovay [Tue, 12 May 2015 21:17:58 +0000 (21:17 +0000)]

am d5fb9cac: am a4d0e528: am d8039f04: am 79167534: am c1174104: am fbd4af0f: Merge "Docs: New swipe-to-refresh training guide." into lmp-docs

* commit 'd5fb9cac87d65d59e9d2c0fa4242fb6eeb4edf6d':

commit | commitdiff | tree

Harish Mahendrakar [Tue, 12 May 2015 21:17:48 +0000 (21:17 +0000)]

am 34265cd9: media: Added MPEG2 profile/levels and tests

* commit '34265cd94f76cc18648c310e4f120d280bf3a0a4':
media: Added MPEG2 profile/levels and tests

commit | commitdiff | tree

Tony Mantler [Tue, 12 May 2015 21:17:37 +0000 (21:17 +0000)]

am def4c0c4: Merge "Don\'t crash in StorageMeasurement if volume isn\'t mounted" into mnc-dev

* commit 'def4c0c49aeebccbb42d9b82901a7de81782baad':
Don't crash in StorageMeasurement if volume isn't mounted

commit | commitdiff | tree

Yang Ni [Tue, 12 May 2015 21:17:25 +0000 (21:17 +0000)]

am 102badf8: Merge "Sanity checks in JNI code for closure creation" into mnc-dev

* commit '102badf834256e209e1a5f58fde1d67b8fd5ac0b':
Sanity checks in JNI code for closure creation

commit | commitdiff | tree

Raph Levien [Tue, 12 May 2015 21:17:17 +0000 (21:17 +0000)]

am be8db119: Merge "Fix NPE in Html.inParagraph()" into mnc-dev

* commit 'be8db119726a229ca687b99fcdb8a6a959648cd1':
Fix NPE in Html.inParagraph()

commit | commitdiff | tree

Julia Reynolds [Tue, 12 May 2015 21:16:55 +0000 (21:16 +0000)]

am 9e540a51: Merge "Fixing docs." into mnc-dev

* commit '9e540a512281560a9b4ffc0edbe68cddaf9bc3b4':
Fixing docs.

commit | commitdiff | tree

Yorke Lee [Tue, 12 May 2015 21:16:42 +0000 (21:16 +0000)]

am 1542179b: Merge "Add hidden methods to set/get default dialer across users" into mnc-dev

* commit '1542179bd2bc82db31a925550b47151cf579c767':
Add hidden methods to set/get default dialer across users

commit | commitdiff | tree

John Reck [Tue, 12 May 2015 21:16:33 +0000 (21:16 +0000)]

am fe2f7e31: Merge "Add some basic DA unit tests" into mnc-dev

* commit 'fe2f7e31be01c8c0ebcbdfb1ff8ae420f24c0ac2':
Add some basic DA unit tests

commit | commitdiff | tree

Casper Bonde [Tue, 12 May 2015 21:15:59 +0000 (21:15 +0000)]

am 424681e4: Settings UI for SIM access profile (2/2)

* commit '424681e43e454bfcbceb863ddccb875ea57ec26f':
Settings UI for SIM access profile (2/2)

commit | commitdiff | tree

Alan Viverette [Tue, 12 May 2015 21:15:30 +0000 (21:15 +0000)]

am 261208e0: Merge "Add API for obtaining changing configurations bitmask from Theme" into mnc-dev

* commit '261208e002775fe9a9f4e79e9f70b41852cfbe60':
Add API for obtaining changing configurations bitmask from Theme

commit | commitdiff | tree

Jean-Michel Trivi [Tue, 12 May 2015 21:14:52 +0000 (21:14 +0000)]

am 28a51628: Merge "AudioRecord JNI: use default UID / PID" into mnc-dev

* commit '28a516280a59a81aeecbf4a68057019d59feb872':
AudioRecord JNI: use default UID / PID

commit | commitdiff | tree

Todd Kennedy [Tue, 12 May 2015 21:14:42 +0000 (21:14 +0000)]

am 3266f60b: Merge "Call Activity#onAttachFragment()" into mnc-dev

* commit '3266f60ba0c2a37883446cadbfc00bb8354824d0':
Call Activity#onAttachFragment()

commit | commitdiff | tree

Kenny Guy [Tue, 12 May 2015 21:14:27 +0000 (21:14 +0000)]

am e02b7868: Merge "Call profile changed in cases were focused activity is nulled." into mnc-dev

* commit 'e02b7868c6c8f856a21f36569a77dab7f1cc7c78':
Call profile changed in cases were focused activity is nulled.

commit | commitdiff | tree

Svet Ganov [Tue, 12 May 2015 21:14:06 +0000 (21:14 +0000)]

am 4a64b19f: Merge "Permission UI - legacy apps support" into mnc-dev

* commit '4a64b19f239b6bff82a032329ce5781681843044':
Permission UI - legacy apps support

commit | commitdiff | tree

John Reck [Tue, 12 May 2015 21:13:44 +0000 (21:13 +0000)]

am c64b3fab: Merge "Attempt to solve the double-GC problem" into mnc-dev

* commit 'c64b3fab95cff6f33cba524f1b9c540cfb75c73b':
Attempt to solve the double-GC problem

commit | commitdiff | tree

John Spurlock [Tue, 12 May 2015 21:13:34 +0000 (21:13 +0000)]

am 0bc8afff: Merge "Zen: Remove calendar rule attendance attribute." into mnc-dev

* commit '0bc8afff7eb3b5af72b7e9a4ce3954488bfbecd0':
Zen: Remove calendar rule attendance attribute.

commit | commitdiff | tree

Seigo Nonaka [Tue, 12 May 2015 21:12:54 +0000 (21:12 +0000)]

am d4474cb9: Remove dead code from IMMS.

* commit 'd4474cb9454c7a8b907c0be07236ffed4ecf3fd8':
Remove dead code from IMMS.

commit | commitdiff | tree

Dirk Dougherty [Tue, 12 May 2015 21:12:44 +0000 (21:12 +0000)]

am 08e474ca: am 08c72b91: am ecfed34d: Merge "Doc change: merge landing page and header/footer designs." into mnc-preview-docs

* commit '08e474ca24c024be29ed8a593cbd2748abde44ce':
Doc change: merge landing page and header/footer designs.

commit | commitdiff | tree

Rich Slogar [Tue, 12 May 2015 21:11:46 +0000 (21:11 +0000)]

am 703b5f89: am 2f626153: am 39220a7e: am 023901c6: am ffd0e519: Merge "docs: Update Eclipse migrate procedure" into lmp-docs

* commit '703b5f895d8be08d795ace72c74576e1e4b6c5b6':
docs: Update Eclipse migrate procedure

commit | commitdiff | tree

Andrew Solovay [Tue, 12 May 2015 21:11:39 +0000 (21:11 +0000)]

am 3e51aa39: am 168bbcef: am 65241c66: am 9ceea140: am fbd4af0f: Merge "Docs: New swipe-to-refresh training guide." into lmp-docs

* commit '3e51aa39818e896d8ada9820ebb4c4bc30d81e57':
Docs: New swipe-to-refresh training guide.

commit | commitdiff | tree

Prerepa Viswanadham [Tue, 12 May 2015 21:11:08 +0000 (21:11 +0000)]

am d1808401: Merge changes from topic \'mwd-merge-050415\' into mnc-dev

* commit 'd1808401ca3bfd6b6b9a975c1e739b194d18f849': (62 commits)
  Clarifying which receiver method to call.
  SystemUI strings: prospective VPN strings for apps
  Add javax.crypto.Mac as a supported CryptoObject to Fingerprint
  Adjust display inversion matrix to account for luminance
  Import translations. DO NOT MERGE
  Add a libbase static depedency for aapt2.
  Add a libbase static depedency for aapt2.
  Add a static dependency on libbase.
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Fix build
  Properly describe exception
  Expand the notification panel by Meta-N.
  DO NOT MERGE - Make sure to return network type after conversion
  DO NOT MERGE - Radio Access Family related fixes
  DO NOT MERGE - Multi-sim device would show 2 PLMN in status bar even if they are same.
  Fix incorrect getType signature/implementation in doc.
  Add plumbing for merge failures and renable button. (3/4)
  Fix NPE in Bundle#hasFileDescriptor on null-valued SparseArray
  ...

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 12 May 2015 21:07:37 +0000 (21:07 +0000)]

am 44b60be1: Merge "Add user selectable Default Browser feature - part 5" into mnc-dev

* commit '44b60be189183138437a3faf9a73388af0efcf44':
Add user selectable Default Browser feature - part 5

commit | commitdiff | tree

Adam Lesinski [Tue, 12 May 2015 21:07:30 +0000 (21:07 +0000)]

am 5b151690: Merge "AAPT2: Add option to generate static library" into mnc-dev

* commit '5b1516900ac23fbbc32c3fee36009e1dd3569dcd':
AAPT2: Add option to generate static library

commit | commitdiff | tree

Adam Lesinski [Tue, 12 May 2015 21:07:22 +0000 (21:07 +0000)]

am f713aa2f: Merge "AAPT2: Include package name of attributes in styleable from another package" into mnc-dev

* commit 'f713aa2f10ea01fab302536a87bd0521b915cb05':
AAPT2: Include package name of attributes in styleable from another package

commit | commitdiff | tree

Adam Lesinski [Tue, 12 May 2015 21:07:13 +0000 (21:07 +0000)]

am 247bc95c: Merge "AAPT2: Record public status in a more robust way" into mnc-dev

* commit '247bc95cb31c6f7e56814818dc29aa1eb8512e6c':
AAPT2: Record public status in a more robust way

commit | commitdiff | tree

Adam Lesinski [Tue, 12 May 2015 21:06:59 +0000 (21:06 +0000)]

am 2f519532: Merge "Add namespace handling in attribute values" into mnc-dev

* commit '2f519532eecd881b034a4e31f57336724604cb56':
Add namespace handling in attribute values

commit | commitdiff | tree

Jorim Jaggi [Tue, 12 May 2015 21:06:40 +0000 (21:06 +0000)]

am f31a7003: Merge "Update emergency call button label when language changes" into mnc-dev

* commit 'f31a7003643988c7e2682a4f9256a28b04877035':
Update emergency call button label when language changes

commit | commitdiff | tree

Robert Shih [Tue, 12 May 2015 21:06:18 +0000 (21:06 +0000)]

am 5eac1da3: Merge "MediaPlayer: setSubtitleAnchor on a HandlerThread" into mnc-dev

* commit '5eac1da3bbd513f6b5204454afa09c8d6c3c9c06':
MediaPlayer: setSubtitleAnchor on a HandlerThread

commit | commitdiff | tree

Jorim Jaggi [Tue, 12 May 2015 21:05:56 +0000 (21:05 +0000)]

am 9f74303e: Track unlock attempts per user.

* commit '9f74303eb8432aa64a7030f58ab0c3279a20c53e':
Track unlock attempts per user.

commit | commitdiff | tree

Andre Eisenbach [Tue, 12 May 2015 21:05:37 +0000 (21:05 +0000)]

am ab258139: BluetoothSap class should not be public

* commit 'ab2581398c812917145088590bd18eb83f3a2ea6':
BluetoothSap class should not be public

commit | commitdiff | tree

Wei Jia [Tue, 12 May 2015 21:05:20 +0000 (21:05 +0000)]

am 73b4a330: Merge "MediaSync: clean up configureAudioTrack and configureSurface." into mnc-dev

* commit '73b4a3303ed97860d4a4c0795afd680aa5158d4e':
MediaSync: clean up configureAudioTrack and configureSurface.

commit | commitdiff | tree

Joe Fernandez [Tue, 12 May 2015 21:05:11 +0000 (21:05 +0000)]

am 2dc05e22: am 722b509d: am a246d2dd: am 9dabc784: Merge "docs: Android Developer Dashboard update - May 2015" into lmp-mr1-ub-docs

* commit '2dc05e22bdbebe3f276391a743f525b0e1a2504e':
docs: Android Developer Dashboard update - May 2015

commit | commitdiff | tree

Rich Slogar [Tue, 12 May 2015 21:05:02 +0000 (21:05 +0000)]

am 3b7af8c9: am 0d133125: am d3de33e9: am 2b46b70d: am a541020a: am e7bfe5b3: docs: sdk 24.2.0 revisions

* commit '3b7af8c9b4e5e76c9fe3fcda08cc7cfeff906683':

commit | commitdiff | tree

Dirk Dougherty [Tue, 12 May 2015 21:04:50 +0000 (21:04 +0000)]

am 41ef6ba4: am fd92db9c: am 35219b7d: am b42c5f80: Update N6 device art port image to remove shadow.

* commit '41ef6ba4ce330718c71db503788943067b5b62a9':
Update N6 device art port image to remove shadow.

commit | commitdiff | tree

Rich Slogar [Tue, 12 May 2015 21:04:40 +0000 (21:04 +0000)]

am d5aa39cc: am 5bf92cba: am ffac3c82: am 67a05f0c: am e7bfe5b3: docs: sdk 24.2.0 revisions

* commit 'd5aa39cc0aab9b6175ebafd87eed6894ac4d949f':
docs: sdk 24.2.0 revisions

commit | commitdiff | tree

Joe Fernandez [Tue, 12 May 2015 21:04:29 +0000 (21:04 +0000)]

am ed4331d2: am 419aff0f: am ddb65560: Merge "docs: M Preview mini site skeleton" into mnc-preview-docs

* commit 'ed4331d29a63b30293bb2176712c491c65190623':
docs: M Preview mini site skeleton

commit | commitdiff | tree

George Mount [Tue, 12 May 2015 21:04:09 +0000 (21:04 +0000)]

am 57436d3f: Merge "Fix potential NPE in internal isValidTarget method." into mnc-dev

* commit '57436d3f7e7fca99400a9b90e93491e892d135ae':
Fix potential NPE in internal isValidTarget method.

commit | commitdiff | tree

Andre Eisenbach [Tue, 12 May 2015 21:03:56 +0000 (21:03 +0000)]

am f455986a: Add documentation for BluetoothSocket.getConnectionType()

* commit 'f455986a45328614c8dd07a4d60a30b9ddc3d994':
Add documentation for BluetoothSocket.getConnectionType()

commit | commitdiff | tree

George Mount [Tue, 12 May 2015 21:03:47 +0000 (21:03 +0000)]

am c81af1ca: Merge "When returning, transition only existing shared elements." into mnc-dev

* commit 'c81af1ca7838f79ecc39fe0a9bf269880fa515e5':
When returning, transition only existing shared elements.

commit | commitdiff | tree

Chris Wren [Tue, 12 May 2015 21:03:39 +0000 (21:03 +0000)]

am 0425de31: Merge "eliminate notification clicker garbage." into mnc-dev

* commit '0425de31cf9a2ad8e5883c64d27dc2ee90d0377c':
eliminate notification clicker garbage.

commit | commitdiff | tree

Sanket Padawe [Tue, 12 May 2015 21:03:30 +0000 (21:03 +0000)]

am 5c33a2e3: Merge "Adding "Connected, no Internet" string in Wifi nw summary." into mnc-dev

* commit '5c33a2e3ecf3c495e00614029df917e0754d7397':
Adding "Connected, no Internet" string in Wifi nw summary.

commit | commitdiff | tree

George Mount [Tue, 12 May 2015 21:03:20 +0000 (21:03 +0000)]

am 61bab469: Merge "Fix Visibility not changing until Animator ends." into mnc-dev

* commit '61bab469a1529ef61cadb870ca4cc533a5510cfb':
Fix Visibility not changing until Animator ends.

commit | commitdiff | tree

Alan Viverette [Tue, 12 May 2015 21:03:11 +0000 (21:03 +0000)]

am 394f9360: Merge "More documentation for handling RippleDrawable mask at run time" into mnc-dev

* commit '394f9360c91c588fb1630f2d6af65fabe4c241a6':
More documentation for handling RippleDrawable mask at run time

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 12 May 2015 21:03:02 +0000 (21:03 +0000)]

am 8ef631de: Merge "Add user selectable Default Browser feature - part 4" into mnc-dev

* commit '8ef631de47d4e52cafe5f9182633892b480dfcdb':
Add user selectable Default Browser feature - part 4

commit | commitdiff | tree

Alan Viverette [Tue, 12 May 2015 21:02:54 +0000 (21:02 +0000)]

am d38d3574: Merge "Always force constructors accessible during inflation" into mnc-dev

* commit 'd38d3574d0b1905d41891c2d7f89892ab13803ae':
Always force constructors accessible during inflation

commit | commitdiff | tree

John Spurlock [Tue, 12 May 2015 21:02:45 +0000 (21:02 +0000)]

am ad2399f3: Merge "Zen: Implement calendar event system condition provider." into mnc-dev

* commit 'ad2399f3be4861d0f5acf072460d98fafc951c57':
Zen: Implement calendar event system condition provider.

commit | commitdiff | tree

Jeff Sharkey [Tue, 12 May 2015 21:02:38 +0000 (21:02 +0000)]

am 5f809e3f: Merge "Avoid NPE when fsUuid is null." into mnc-dev

* commit '5f809e3fff2b4c6c94d966ceb93e6cf74fe9813b':
Avoid NPE when fsUuid is null.

commit | commitdiff | tree

John Reck [Tue, 12 May 2015 21:02:23 +0000 (21:02 +0000)]

am e678b41c: Merge "Fix setName use-after-free" into mnc-dev

* commit 'e678b41cdb56847c094260607ea39aea4abb808e':
Fix setName use-after-free

commit | commitdiff | tree

Jose Lima [Tue, 12 May 2015 21:02:05 +0000 (21:02 +0000)]

am 5551aca2: Merge "Move ContentInfoExtender from Notification.java to a support library" into mnc-dev

* commit '5551aca2b8ec9fe7ab5ffda8dad82ee104556962':
Move ContentInfoExtender from Notification.java to a support library

commit | commitdiff | tree

Steve McKay [Tue, 12 May 2015 21:01:55 +0000 (21:01 +0000)]

am 5d2c1d54: Merge "Ensure sort menu is shown as needed." into mnc-dev

* commit '5d2c1d54b953ac0e4243210237fec92e3105844e':
Ensure sort menu is shown as needed.

commit | commitdiff | tree

Geoff Mendal [Tue, 12 May 2015 21:01:47 +0000 (21:01 +0000)]

am cf1f2ea5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'cf1f2ea5a7945dc4982b1e41197af94ad64e8f37':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Jason Sams [Wed, 6 May 2015 19:40:20 +0000 (19:40 +0000)]

Merge "Fix Allocation-less launches" into mnc-dev

commit | commitdiff | tree

Tim Murray [Wed, 6 May 2015 19:31:47 +0000 (19:31 +0000)]

Merge "Add loop option to hwuitest." into mnc-dev

commit | commitdiff | tree

Tim Murray [Wed, 6 May 2015 18:37:37 +0000 (11:37 -0700)]

Add loop option to hwuitest.

Change-Id: I15b6b121bd6bd963e5b433bdd93d6dc3e83645b8

commit | commitdiff | tree

Chris Wren [Wed, 6 May 2015 18:34:46 +0000 (18:34 +0000)]

Merge "count panel open method" into mnc-dev