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

destradaa [Wed, 30 Jul 2014 23:51:17 +0000 (23:51 +0000)]

am f4fdceb1: am b46316dd: am 823ac05c: Add support for sources in Geofencing APIs.

* commit 'f4fdceb117ebdc41c2937da86a751936c0f8c21a':
Add support for sources in Geofencing APIs.

commit | commitdiff | tree

destradaa [Wed, 30 Jul 2014 23:46:24 +0000 (23:46 +0000)]

am b46316dd: am 823ac05c: Add support for sources in Geofencing APIs.

* commit 'b46316ddee783ed75b1155a89004a3cb00a0426f':
Add support for sources in Geofencing APIs.

commit | commitdiff | tree

destradaa [Wed, 30 Jul 2014 23:42:50 +0000 (23:42 +0000)]

am 823ac05c: Add support for sources in Geofencing APIs.

* commit '823ac05cce1c324b8d9c8688b89a439fdfae6600':
Add support for sources in Geofencing APIs.

commit | commitdiff | tree

destradaa [Fri, 25 Jul 2014 22:11:56 +0000 (15:11 -0700)]

Add support for sources in Geofencing APIs.

Support setting the source when adding geofences.
b/14117199

Surface the source when FLP geofence changes state.
b/14119200

Change-Id: I50dc40a9caee400594e1778c98e284e0db0d5e66

commit | commitdiff | tree

Ruben Brunk [Wed, 30 Jul 2014 23:27:35 +0000 (23:27 +0000)]

am 49848592: am 6946415f: am e95f2a0e: camera2: Implement request templates for LEGACY.

* commit '4984859292319f2f2ac42ea745012215e5bea84f':
camera2: Implement request templates for LEGACY.

commit | commitdiff | tree

Ruben Brunk [Wed, 30 Jul 2014 23:23:34 +0000 (23:23 +0000)]

am 6946415f: am e95f2a0e: camera2: Implement request templates for LEGACY.

* commit '6946415f57e1af4988c2422eb62577165b24ff24':
camera2: Implement request templates for LEGACY.

commit | commitdiff | tree

Ruben Brunk [Wed, 30 Jul 2014 23:18:07 +0000 (23:18 +0000)]

am e95f2a0e: camera2: Implement request templates for LEGACY.

* commit 'e95f2a0ee4f3062ca42dc4fc1c128172df651969':
camera2: Implement request templates for LEGACY.

commit | commitdiff | tree

Ruben Brunk [Wed, 30 Jul 2014 05:37:28 +0000 (22:37 -0700)]

camera2: Implement request templates for LEGACY.

Bug: 15116722
Change-Id: Ic32e2f597997489642e98bfd8c7582a300f6f29b

commit | commitdiff | tree

Yao Chen [Wed, 30 Jul 2014 22:56:30 +0000 (22:56 +0000)]

am de3094fd: am 89ad0a89: am 2705fc25: Adds toString() in MediaBrowserItem

* commit 'de3094fd608e508cdd7026885ba94236da65ae57':
Adds toString() in MediaBrowserItem

commit | commitdiff | tree

Yao Chen [Wed, 30 Jul 2014 22:52:37 +0000 (22:52 +0000)]

am 89ad0a89: am 2705fc25: Adds toString() in MediaBrowserItem

* commit '89ad0a8911980ff2d458d5ccf96239b2f59e9ee7':
Adds toString() in MediaBrowserItem

commit | commitdiff | tree

Yao Chen [Wed, 30 Jul 2014 22:48:13 +0000 (22:48 +0000)]

am 2705fc25: Adds toString() in MediaBrowserItem

* commit '2705fc25c7c0c7c9e04fa52a05fff7dcd277a71a':
Adds toString() in MediaBrowserItem

commit | commitdiff | tree

Yao Chen [Wed, 30 Jul 2014 22:35:13 +0000 (15:35 -0700)]

Adds toString() in MediaBrowserItem

Bug: 16676746
Change-Id: I61152dca66e6715807868a5c72a1fdf06c78d7ab

commit | commitdiff | tree

Ruben Brunk [Wed, 30 Jul 2014 22:23:40 +0000 (22:23 +0000)]

am 91aedfe5: am ecdb20ca: am 3916e3ba: camera2: Add scene and effect mode for LEGACY.

* commit '91aedfe5a21f0df770af6379af76211e3d6b12d1':
camera2: Add scene and effect mode for LEGACY.

commit | commitdiff | tree

Ruben Brunk [Wed, 30 Jul 2014 22:19:40 +0000 (22:19 +0000)]

am ecdb20ca: am 3916e3ba: camera2: Add scene and effect mode for LEGACY.

* commit 'ecdb20cab808f1e9424a9f234f4d528ed1b3956f':
camera2: Add scene and effect mode for LEGACY.

commit | commitdiff | tree

Ruben Brunk [Wed, 30 Jul 2014 22:15:04 +0000 (22:15 +0000)]

am 3916e3ba: camera2: Add scene and effect mode for LEGACY.

* commit '3916e3ba989cae92246c35c02f8230bc2cdc2505':
camera2: Add scene and effect mode for LEGACY.

commit | commitdiff | tree

Ruben Brunk [Thu, 24 Jul 2014 20:33:47 +0000 (13:33 -0700)]

camera2: Add scene and effect mode for LEGACY.

Bug: 15116722

Change-Id: I0797fccb5fdd8b959622c100f25b2950cfe4e115

commit | commitdiff | tree

Adam Lesinski [Wed, 30 Jul 2014 22:06:43 +0000 (22:06 +0000)]

am cedeb363: am 872df53b: am bb8ac196: Add shared library support to aapt dump

* commit 'cedeb363c2b0d982ca21570b3bf2866489666db5':
Add shared library support to aapt dump

commit | commitdiff | tree

Adam Lesinski [Wed, 30 Jul 2014 22:02:44 +0000 (22:02 +0000)]

am 872df53b: am bb8ac196: Add shared library support to aapt dump

* commit '872df53bc44fb08a93c1ad0cd8fb3e42f076734f':
Add shared library support to aapt dump

commit | commitdiff | tree

Adam Lesinski [Wed, 30 Jul 2014 21:58:40 +0000 (21:58 +0000)]

am bb8ac196: Add shared library support to aapt dump

* commit 'bb8ac19684449644bd5218b57c9b14b3de12818e':
Add shared library support to aapt dump

commit | commitdiff | tree

Adam Lesinski [Wed, 30 Jul 2014 18:40:39 +0000 (11:40 -0700)]

Add shared library support to aapt dump

AAPT dump should be able to handle dynamic references
that often come with shared library resources.

Bug:16678251
Change-Id: I6c8cd943145aab20ca9db9694c8c433b3c64279b

commit | commitdiff | tree

Behdad Esfahbod [Wed, 30 Jul 2014 21:51:41 +0000 (21:51 +0000)]

am 08302cf8: am 74b5b699: am 8bbd753a: Support FontFeatureSettings in Paint

* commit '08302cf887eb1265179479e5883141b16d14e715':
Support FontFeatureSettings in Paint

commit | commitdiff | tree

Andres Morales [Wed, 30 Jul 2014 21:46:41 +0000 (21:46 +0000)]

am 6f770576: am 0de25904: am bdb80096: Merge "Revert "NFC Unlock api changes"" into lmp-dev

* commit '6f770576d30ec901de45415a2ce37d0dfbb29fcc':
Revert "NFC Unlock api changes"

commit | commitdiff | tree

Behdad Esfahbod [Wed, 30 Jul 2014 21:46:04 +0000 (21:46 +0000)]

am 74b5b699: am 8bbd753a: Support FontFeatureSettings in Paint

* commit '74b5b699e634031042204aa9a085b3c96d84854e':
Support FontFeatureSettings in Paint

commit | commitdiff | tree

Behdad Esfahbod [Wed, 30 Jul 2014 21:42:22 +0000 (21:42 +0000)]

am 8bbd753a: Support FontFeatureSettings in Paint

* commit '8bbd753a20cc3fdcc4e92fb99e807b5a69cae6b2':
Support FontFeatureSettings in Paint

commit | commitdiff | tree

Andres Morales [Wed, 30 Jul 2014 21:41:56 +0000 (21:41 +0000)]

am 0de25904: am bdb80096: Merge "Revert "NFC Unlock api changes"" into lmp-dev

* commit '0de25904c41a47f6e233bc0ee9fa2264e6d9bf92':
Revert "NFC Unlock api changes"

commit | commitdiff | tree

Behdad Esfahbod [Tue, 29 Jul 2014 22:43:03 +0000 (18:43 -0400)]

Support FontFeatureSettings in Paint

New API is hidden.

Bug: 15246510
Change-Id: Idefca06a366de0d87f53d123b5291788448de4d0

commit | commitdiff | tree

Alan Viverette [Wed, 30 Jul 2014 21:35:26 +0000 (21:35 +0000)]

am 72cb9b21: am 28affba6: am 077daef9: Merge "Update switch assets, fix SearchView asset 9-patch areas" into lmp-dev

* commit '72cb9b21a3fc4173b42f85c052c0dee2fd137ac2':
Update switch assets, fix SearchView asset 9-patch areas

commit | commitdiff | tree

keunyoung [Wed, 30 Jul 2014 21:35:18 +0000 (21:35 +0000)]

am 4e8e785e: am 669f8f22: am 4d2751c5: Merge "add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode" into lmp-dev

* commit '4e8e785e2b7f58de656c7d473dcedd96c1a91e80':
add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode

commit | commitdiff | tree

Andres Morales [Wed, 30 Jul 2014 21:34:36 +0000 (21:34 +0000)]

am bdb80096: Merge "Revert "NFC Unlock api changes"" into lmp-dev

* commit 'bdb800965afbb3a4b94ed5a43ef3662d703ebb31':
Revert "NFC Unlock api changes"

commit | commitdiff | tree

Alan Viverette [Wed, 30 Jul 2014 21:30:35 +0000 (21:30 +0000)]

am 28affba6: am 077daef9: Merge "Update switch assets, fix SearchView asset 9-patch areas" into lmp-dev

* commit '28affba60ec851f950b308d72d1e1c6a89a703bd':
Update switch assets, fix SearchView asset 9-patch areas

commit | commitdiff | tree

keunyoung [Wed, 30 Jul 2014 21:30:31 +0000 (21:30 +0000)]

am 669f8f22: am 4d2751c5: Merge "add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode" into lmp-dev

* commit '669f8f22c9e1b88e151c293300345164e8dfc012':
add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode

commit | commitdiff | tree

Andres Morales [Wed, 30 Jul 2014 21:30:24 +0000 (21:30 +0000)]

am 8ecfad36: am 6b53a8a7: am 9fef5fbc: NFC Unlock api changes

* commit '8ecfad3616258c191c23ff1048b7965c0bb03a06':
NFC Unlock api changes

commit | commitdiff | tree

Joe Fernandez [Wed, 30 Jul 2014 21:30:20 +0000 (21:30 +0000)]

am af33fc38: am 69d33398: am 2c3b3f53: am a3e52154: am ecf76d1c: am b83127f0: Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs

* commit 'af33fc38dd12352590db3b74b9f70b1077a171d1':
docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ

commit | commitdiff | tree

Alan Lau [Wed, 30 Jul 2014 21:30:16 +0000 (21:30 +0000)]

am a05862ab: (-s ours) am b1d2ce67: am 990606f0: am 40274ada: (-s ours) am b12318be: Merge "Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""" into klp-modular-dev

* commit 'a05862ab5698de2ef2d5bdfec8d8ff9f96479ad9':
Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""

commit | commitdiff | tree

Alan Lau [Wed, 30 Jul 2014 21:30:11 +0000 (21:30 +0000)]

am 8e4172be: (-s ours) am 0109c7a3: am 1e438bef: am 839ca0d5: (-s ours) am 06a84554: Merge "Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""" into klp-modular-dev

* commit '8e4172beceaed0459b6983908c3ada3078ac3a7e':
Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""

commit | commitdiff | tree

Alan Viverette [Wed, 30 Jul 2014 21:26:24 +0000 (21:26 +0000)]

am 077daef9: Merge "Update switch assets, fix SearchView asset 9-patch areas" into lmp-dev

* commit '077daef9a28827318790f134adae6d8cd56fd1d3':
Update switch assets, fix SearchView asset 9-patch areas

commit | commitdiff | tree

keunyoung [Wed, 30 Jul 2014 21:26:20 +0000 (21:26 +0000)]

am 4d2751c5: Merge "add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode" into lmp-dev

* commit '4d2751c5596b9a8e85635db483ffd91091ccc557':
add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode

commit | commitdiff | tree

Andres Morales [Wed, 30 Jul 2014 21:26:13 +0000 (21:26 +0000)]

am 6b53a8a7: am 9fef5fbc: NFC Unlock api changes

* commit '6b53a8a7f7fb1bb01b4d11219d8210072d77146e':
NFC Unlock api changes

commit | commitdiff | tree

Joe Fernandez [Wed, 30 Jul 2014 21:26:09 +0000 (21:26 +0000)]

am 69d33398: am 2c3b3f53: am a3e52154: am ecf76d1c: am b83127f0: Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs

* commit '69d33398402d565cb1a30bbecc10f23849583b87':
docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ

commit | commitdiff | tree

Alan Lau [Wed, 30 Jul 2014 21:26:05 +0000 (21:26 +0000)]

am b1d2ce67: am 990606f0: am 40274ada: (-s ours) am b12318be: Merge "Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""" into klp-modular-dev

* commit 'b1d2ce67d2f951fb62a138342abe0138e1267dee':
Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""

commit | commitdiff | tree

Alan Lau [Wed, 30 Jul 2014 21:26:02 +0000 (21:26 +0000)]

am 0109c7a3: am 1e438bef: am 839ca0d5: (-s ours) am 06a84554: Merge "Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""" into klp-modular-dev

* commit '0109c7a329da4a478d212d58e131d8dc7ff16498':
Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""

commit | commitdiff | tree

Sean Wan [Wed, 30 Jul 2014 21:24:09 +0000 (21:24 +0000)]

am 3cea91e0: am 3c2a02dc: am b4a0e3ef: Merge "Fixed a NullPointerException in AccountManagerService." into lmp-dev

* commit '3cea91e07330b6778c03510dbf7a7f71fc8477d5':
Fixed a NullPointerException in AccountManagerService.

commit | commitdiff | tree

Robert Ly [Wed, 30 Jul 2014 21:24:01 +0000 (21:24 +0000)]

am a4c15e66: am 4d58740b: am a5e5d455: Merge "resolved conflicts for merge of 60e7f541 to lmp-dev" into lmp-dev

* commit 'a4c15e668b5dc780fa7d2acdb9d4bc7ad788a244':
docs: Revised page to include info about new Publisher API.

commit | commitdiff | tree

Martijn Coenen [Wed, 30 Jul 2014 21:23:56 +0000 (21:23 +0000)]

am ffe93b5e: am 9791d590: am e5996ff4: Merge "Make some NFC APIs @systemAPI." into lmp-dev

* commit 'ffe93b5eefae759fcffc61765d569cc80d9c33d4':
Make some NFC APIs @systemAPI.

commit | commitdiff | tree

Raph Levien [Wed, 30 Jul 2014 21:23:52 +0000 (21:23 +0000)]

am 0389f676: am a7e1d873: am c4445abb: Merge "Bump refcount of canvas created for Picture" into lmp-dev

* commit '0389f6769645468a6380a99b6845dfce85f64963':
Bump refcount of canvas created for Picture

commit | commitdiff | tree

Andres Morales [Wed, 30 Jul 2014 21:21:22 +0000 (21:21 +0000)]

am 9fef5fbc: NFC Unlock api changes

* commit '9fef5fbcd6d47ef86823b3a2d82d34801f9be335':
NFC Unlock api changes

commit | commitdiff | tree

Joe Fernandez [Wed, 30 Jul 2014 21:21:18 +0000 (21:21 +0000)]

am 2c3b3f53: am a3e52154: am ecf76d1c: am b83127f0: Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs

* commit '2c3b3f53b848c627744b3dd78a4b7aa654e73109':
docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ

commit | commitdiff | tree

Alan Lau [Wed, 30 Jul 2014 21:21:14 +0000 (21:21 +0000)]

am 990606f0: am 40274ada: (-s ours) am b12318be: Merge "Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""" into klp-modular-dev

* commit '990606f0fb6b03838f40eb5a5f2fa1fbb9c257d1':
Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""

commit | commitdiff | tree

Alan Lau [Wed, 30 Jul 2014 21:21:10 +0000 (21:21 +0000)]

am 1e438bef: am 839ca0d5: (-s ours) am 06a84554: Merge "Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""" into klp-modular-dev

* commit '1e438befc1cc2716f23573c3253cf4b24377ad07':
Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""

commit | commitdiff | tree

Sean Wan [Wed, 30 Jul 2014 21:20:52 +0000 (21:20 +0000)]

am 3c2a02dc: am b4a0e3ef: Merge "Fixed a NullPointerException in AccountManagerService." into lmp-dev

* commit '3c2a02dcab22a8c70bf4b5bdad7a19b84e89fd12':
Fixed a NullPointerException in AccountManagerService.

commit | commitdiff | tree

Robert Ly [Wed, 30 Jul 2014 21:20:47 +0000 (21:20 +0000)]

am 4d58740b: am a5e5d455: Merge "resolved conflicts for merge of 60e7f541 to lmp-dev" into lmp-dev

* commit '4d58740bf1b16418086c22473da6d03a72ba98f8':
docs: Revised page to include info about new Publisher API.

commit | commitdiff | tree

Martijn Coenen [Wed, 30 Jul 2014 21:20:43 +0000 (21:20 +0000)]

am 9791d590: am e5996ff4: Merge "Make some NFC APIs @systemAPI." into lmp-dev

* commit '9791d590317261fb31527735ec8181748b3518a8':
Make some NFC APIs @systemAPI.

commit | commitdiff | tree

Raph Levien [Wed, 30 Jul 2014 21:20:39 +0000 (21:20 +0000)]

am a7e1d873: am c4445abb: Merge "Bump refcount of canvas created for Picture" into lmp-dev

* commit 'a7e1d87386ebbd8d89f2d37a121840038c96af60':
Bump refcount of canvas created for Picture

commit | commitdiff | tree

Andres Morales [Wed, 23 Jul 2014 19:39:55 +0000 (12:39 -0700)]

NFC Unlock api changes

Bug: 16401635
Change-Id: I138a9aa0bb156982b6c7656c51a1e2194776e4ed

commit | commitdiff | tree

Sean Wan [Wed, 30 Jul 2014 21:16:54 +0000 (21:16 +0000)]

am b4a0e3ef: Merge "Fixed a NullPointerException in AccountManagerService." into lmp-dev

* commit 'b4a0e3efc8dc5b26cbc2476c67b052914a2970bf':
Fixed a NullPointerException in AccountManagerService.

commit | commitdiff | tree

Robert Ly [Wed, 30 Jul 2014 21:16:49 +0000 (21:16 +0000)]

am a5e5d455: Merge "resolved conflicts for merge of 60e7f541 to lmp-dev" into lmp-dev

* commit 'a5e5d455c6cb605fd289a9147b80adf0a955addb':
docs: Revised page to include info about new Publisher API.

commit | commitdiff | tree

Martijn Coenen [Wed, 30 Jul 2014 21:16:45 +0000 (21:16 +0000)]

am e5996ff4: Merge "Make some NFC APIs @systemAPI." into lmp-dev

* commit 'e5996ff428d5adb5d523878d67db347b1676b3bc':
Make some NFC APIs @systemAPI.

commit | commitdiff | tree

Raph Levien [Wed, 30 Jul 2014 21:16:41 +0000 (21:16 +0000)]

am c4445abb: Merge "Bump refcount of canvas created for Picture" into lmp-dev

* commit 'c4445abba696f199eca2ad9943b51e84d016d494':
Bump refcount of canvas created for Picture

commit | commitdiff | tree

Jason Monk [Wed, 30 Jul 2014 21:16:17 +0000 (21:16 +0000)]

am 0fdcd6b4: am 741f5c3a: am 6b21f4e6: Allow System UI access to VPN.

* commit '0fdcd6b4dae662bd4b2a7eec10b07443ed06b206':
Allow System UI access to VPN.

commit | commitdiff | tree

Joe Fernandez [Wed, 30 Jul 2014 21:14:39 +0000 (21:14 +0000)]

am a3e52154: am ecf76d1c: am b83127f0: Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs

* commit 'a3e521540b1143264033ca217d11b90ec20e6c54':
docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ

commit | commitdiff | tree

Alan Lau [Wed, 30 Jul 2014 21:14:33 +0000 (21:14 +0000)]

am 40274ada: (-s ours) am b12318be: Merge "Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""" into klp-modular-dev

* commit '40274ada4a8699a18836c369ca26ebb837ca37f2':
Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""

commit | commitdiff | tree

Alan Lau [Wed, 30 Jul 2014 21:14:29 +0000 (21:14 +0000)]

am 839ca0d5: (-s ours) am 06a84554: Merge "Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""" into klp-modular-dev

* commit '839ca0d5fa3b22e1e27aa8110d665aa6b6b91e26':
Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""

commit | commitdiff | tree

Jason Monk [Wed, 30 Jul 2014 21:10:44 +0000 (21:10 +0000)]

am 741f5c3a: am 6b21f4e6: Allow System UI access to VPN.

* commit '741f5c3abf14e593f919de2bb558eeb012ae2951':
Allow System UI access to VPN.

commit | commitdiff | tree

Jason Monk [Wed, 30 Jul 2014 21:06:20 +0000 (21:06 +0000)]

am 6b21f4e6: Allow System UI access to VPN.

* commit '6b21f4e67d482cf765aac8c1d9dda38e1541b8ad':
Allow System UI access to VPN.

commit | commitdiff | tree

Jason Monk [Wed, 30 Jul 2014 20:41:52 +0000 (16:41 -0400)]

Allow System UI access to VPN.

Bug: 16153201
Change-Id: I5f5e9e0ed3e4e02d6a6995011356b350758f068d

commit | commitdiff | tree

Raph Levien [Wed, 30 Jul 2014 21:03:18 +0000 (21:03 +0000)]

Merge "Bump refcount of canvas created for Picture" into lmp-dev

commit | commitdiff | tree

Raph Levien [Wed, 30 Jul 2014 20:41:10 +0000 (13:41 -0700)]

Bump refcount of canvas created for Picture

Both the Canvas and Picture objects will unref the canvas in their
finalizers, so an extra ref is needed. This had been present but was
inadvertently removed in the patch "Refactor android.graphics.Picture
JNI bindings." This patch simply restores the previous ref and comment.

Bug: 16399257
Change-Id: I9911826bd0e668bd25546ef54b0c9c1d467538c8

commit | commitdiff | tree

Christoph Studer [Wed, 30 Jul 2014 20:34:46 +0000 (20:34 +0000)]

am c63f6df8: am 2522c94a: am 6b8a2734: Merge "SysUI: Display group children when no summary is present" into lmp-dev

* commit 'c63f6df88623578ca199e9c108d36dc2859dc803':
SysUI: Display group children when no summary is present

commit | commitdiff | tree

Chong Zhang [Wed, 30 Jul 2014 20:34:42 +0000 (20:34 +0000)]

am 138ea622: am 351c277a: am baba0e42: fix for MediaCodecList bitrate range exception

* commit '138ea622cc122e98896f6880eb3301c0609f6edc':
fix for MediaCodecList bitrate range exception

commit | commitdiff | tree

Christoph Studer [Wed, 30 Jul 2014 20:28:28 +0000 (20:28 +0000)]

am 2522c94a: am 6b8a2734: Merge "SysUI: Display group children when no summary is present" into lmp-dev

* commit '2522c94abf436f8886cfaac0e06ce4fcba364e82':
SysUI: Display group children when no summary is present

commit | commitdiff | tree

Chong Zhang [Wed, 30 Jul 2014 20:28:24 +0000 (20:28 +0000)]

am 351c277a: am baba0e42: fix for MediaCodecList bitrate range exception

* commit '351c277a4ce741f3b5f323bf929f24d1ce0f7b0d':
fix for MediaCodecList bitrate range exception

commit | commitdiff | tree

Ye Wen [Wed, 30 Jul 2014 20:27:02 +0000 (20:27 +0000)]

am 54f3bf70: am 13f2726f: am e13e2eef: Merge "Move archived column from pdu/sms to threads (1/4)" into lmp-dev

* commit '54f3bf7043f0856a2064f1286a5e83da7130cca9':
Move archived column from pdu/sms to threads (1/4)

commit | commitdiff | tree

Julia Reynolds [Wed, 30 Jul 2014 20:22:55 +0000 (20:22 +0000)]

am abcc590d: am 5e625843: am 72746e41: Merge "API council - DISALLOW_APPS_CONTROL -- need better documentation." into lmp-dev

* commit 'abcc590da8f6e1f2ec9d18e328a9ea8fc64f1f58':
API council - DISALLOW_APPS_CONTROL -- need better documentation.

commit | commitdiff | tree

Christoph Studer [Wed, 30 Jul 2014 20:21:08 +0000 (20:21 +0000)]

am 6b8a2734: Merge "SysUI: Display group children when no summary is present" into lmp-dev

* commit '6b8a27343fec2c72074adde1687d45d43fbb95d9':
SysUI: Display group children when no summary is present

commit | commitdiff | tree

Chong Zhang [Wed, 30 Jul 2014 20:20:59 +0000 (20:20 +0000)]

am baba0e42: fix for MediaCodecList bitrate range exception

* commit 'baba0e4282e875271b79912135bd6418f58913b1':
fix for MediaCodecList bitrate range exception

commit | commitdiff | tree

Ye Wen [Wed, 30 Jul 2014 20:20:38 +0000 (20:20 +0000)]

am 13f2726f: am e13e2eef: Merge "Move archived column from pdu/sms to threads (1/4)" into lmp-dev

* commit '13f2726fa7100fed13cd10f42b9eb3559f0a9aa0':
Move archived column from pdu/sms to threads (1/4)

commit | commitdiff | tree

Ye Wen [Wed, 30 Jul 2014 20:16:49 +0000 (20:16 +0000)]

am e13e2eef: Merge "Move archived column from pdu/sms to threads (1/4)" into lmp-dev

* commit 'e13e2eefca4db78cd80cb36bd79074934b1d32b4':
Move archived column from pdu/sms to threads (1/4)

commit | commitdiff | tree

Julia Reynolds [Wed, 30 Jul 2014 20:16:33 +0000 (20:16 +0000)]

am 5e625843: am 72746e41: Merge "API council - DISALLOW_APPS_CONTROL -- need better documentation." into lmp-dev

* commit '5e62584377fa3002d45b56d7e28b11dff9fd35b1':
API council - DISALLOW_APPS_CONTROL -- need better documentation.

commit | commitdiff | tree

Chong Zhang [Tue, 29 Jul 2014 02:38:29 +0000 (19:38 -0700)]

fix for MediaCodecList bitrate range exception

Bug: 16627391

Change-Id: I8c5ba580d7b875d1e2a0ebbf398cf65dd5c4555f

commit | commitdiff | tree

Julia Reynolds [Wed, 30 Jul 2014 20:08:15 +0000 (20:08 +0000)]

am 72746e41: Merge "API council - DISALLOW_APPS_CONTROL -- need better documentation." into lmp-dev

* commit '72746e415e325a9d54a19f8c82fdbd98b9d3658b':
API council - DISALLOW_APPS_CONTROL -- need better documentation.

commit | commitdiff | tree

Geoff Mendal [Wed, 30 Jul 2014 20:00:59 +0000 (20:00 +0000)]

am a5529547: (-s ours) am 1ee08b8f: (-s ours) am 6764ce22: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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

commit | commitdiff | tree

Geoff Mendal [Wed, 30 Jul 2014 19:55:22 +0000 (19:55 +0000)]

am 1ee08b8f: (-s ours) am 6764ce22: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '1ee08b8fec431ec9cc0efee516996374e3a5ead0':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 30 Jul 2014 19:51:14 +0000 (19:51 +0000)]

am 6764ce22: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '6764ce228db63bcb8e2f33ad8acbff878090e434':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 30 Jul 2014 19:42:20 +0000 (12:42 -0700)]

Import translations. DO NOT MERGE

Change-Id: I956b48a89207dd9e4fc49fe0550a98d3a1cebe02
Auto-generated-cl: translation import

commit | commitdiff | tree

Geoff Mendal [Wed, 30 Jul 2014 19:40:51 +0000 (12:40 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ic01a1f8328a85336d010a72caf8a2fefdae231be
Auto-generated-cl: translation import

commit | commitdiff | tree

Christoph Studer [Wed, 30 Jul 2014 19:41:34 +0000 (19:41 +0000)]

am 0b928f7d: am 572532d0: Merge "Strip RemoteViews from Notifications, re-create them in SysUI" into lmp-dev

* commit '0b928f7dde70525ba55e1963adc93a44a81383e6':
Strip RemoteViews from Notifications, re-create them in SysUI

commit | commitdiff | tree

Derek Sollenberger [Wed, 30 Jul 2014 19:41:29 +0000 (19:41 +0000)]

am 0a9309c7: am 673af558: Merge "Disable fallback chaining in Skia." into lmp-dev

* commit '0a9309c70b16eaa661addba20fe8273f3f5d1e98':
Disable fallback chaining in Skia.

commit | commitdiff | tree

Christoph Studer [Wed, 30 Jul 2014 19:36:45 +0000 (19:36 +0000)]

am 572532d0: Merge "Strip RemoteViews from Notifications, re-create them in SysUI" into lmp-dev

* commit '572532d089d15057c5e00a1d7fcf926d7555299f':
Strip RemoteViews from Notifications, re-create them in SysUI

commit | commitdiff | tree

Derek Sollenberger [Wed, 30 Jul 2014 19:36:41 +0000 (19:36 +0000)]

am 673af558: Merge "Disable fallback chaining in Skia." into lmp-dev

* commit '673af5582dda0d0cb8a3667fbadef747d22193f1':
Disable fallback chaining in Skia.

commit | commitdiff | tree

Geoff Mendal [Wed, 30 Jul 2014 19:32:54 +0000 (19:32 +0000)]

am 2dfcad67: (-s ours) am 9d832d1e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '2dfcad67bf75405e6d2858ad89ae58b3d00e1cc3':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Andres Morales [Wed, 30 Jul 2014 21:31:01 +0000 (21:31 +0000)]

Merge "Revert "NFC Unlock api changes"" into lmp-dev

commit | commitdiff | tree

Andres Morales [Wed, 30 Jul 2014 21:30:50 +0000 (21:30 +0000)]

Revert "NFC Unlock api changes"

This reverts commit 9fef5fbcd6d47ef86823b3a2d82d34801f9be335.

Change-Id: Idabe1c2901e0e26d38f84583308f69804ab2c1c3

commit | commitdiff | tree

Robert Ly [Wed, 30 Jul 2014 21:12:08 +0000 (21:12 +0000)]

Merge "resolved conflicts for merge of 60e7f541 to lmp-dev" into lmp-dev

commit | commitdiff | tree

Robert Ly [Wed, 30 Jul 2014 21:09:25 +0000 (14:09 -0700)]

resolved conflicts for merge of 60e7f541 to lmp-dev

Conflicts:
docs/html/google/play/billing/gp-purchase-status-api.jd

Change-Id: I23f4c1a366b894a3cf5f70e26b32cd88bc66784c

commit | commitdiff | tree

Geoff Mendal [Wed, 30 Jul 2014 19:29:15 +0000 (19:29 +0000)]

am 9d832d1e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '9d832d1e324cc1bee418b68d285b2a08b3a22fa8':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Sandeep Siddhartha [Wed, 30 Jul 2014 19:10:57 +0000 (19:10 +0000)]

am ae7848f4: am 059ffa19: Merge "Make startRecognition async" into lmp-dev

* commit 'ae7848f4d0a40bf1f9205a9d0988c59dfcfdfe89':
Make startRecognition async

commit | commitdiff | tree

Sandeep Siddhartha [Wed, 30 Jul 2014 19:07:20 +0000 (19:07 +0000)]

am 059ffa19: Merge "Make startRecognition async" into lmp-dev

* commit '059ffa19ae00611f53da5c817ad21587e2057149':
Make startRecognition async

commit | commitdiff | tree

Jose Lima [Wed, 30 Jul 2014 19:05:53 +0000 (19:05 +0000)]

am 0d8fe95d: am 28ba97e3: Added LEANBACK_SETTINGS Intent category

* commit '0d8fe95d36c10fc62e78ab9f36aa49440b278e5c':
Added LEANBACK_SETTINGS Intent category

commit | commitdiff | tree

Jose Lima [Wed, 30 Jul 2014 19:00:05 +0000 (19:00 +0000)]

am 28ba97e3: Added LEANBACK_SETTINGS Intent category

* commit '28ba97e3c095f61765504435c7f8725e48ab09ff':
Added LEANBACK_SETTINGS Intent category

commit | commitdiff | tree

Adam Lesinski [Wed, 30 Jul 2014 18:57:29 +0000 (18:57 +0000)]

am ca5fb0dc: am c6240e72: Fix large memory corruption in AAPT

* commit 'ca5fb0dccde2b2552f1374957b3a2a170ef39238':
Fix large memory corruption in AAPT