OSDN Git Service
Paul McLean [Wed, 29 Apr 2015 02:22:34 +0000 (02:22 +0000)]
am
169be3ee: am
62b86779: am
c8240411: Merge "AudioRecord device select continued" into mnc-dev
* commit '
169be3ee660f1afb53074fa3c565ea7e0affe88c':
AudioRecord device select continued
Paul McLean [Wed, 29 Apr 2015 01:58:02 +0000 (01:58 +0000)]
am
62b86779: am
c8240411: Merge "AudioRecord device select continued" into mnc-dev
* commit '
62b8677933fe44cc00bef222139eb22ce466bd90':
AudioRecord device select continued
Paul McLean [Wed, 29 Apr 2015 01:40:52 +0000 (01:40 +0000)]
am
c8240411: Merge "AudioRecord device select continued" into mnc-dev
* commit '
c8240411c38b78ac8095f6e8067f7bcc7046f502':
AudioRecord device select continued
Vinit Deshpande [Wed, 29 Apr 2015 00:51:19 +0000 (00:51 +0000)]
Merge changes from topic 'PasspointUI'
* changes:
Implement 'Available via Passpoint' feature
Fix settings UI for passpoint networks
Mathieu Chartier [Wed, 29 Apr 2015 00:22:03 +0000 (00:22 +0000)]
Mathieu Chartier [Wed, 29 Apr 2015 00:21:58 +0000 (00:21 +0000)]
am
22787ac1: am
e343d613: Merge "Properly describe exception"
* commit '
22787ac1a6d29213eda465c904587a583811f462':
Properly describe exception
Mathieu Chartier [Wed, 29 Apr 2015 00:10:14 +0000 (00:10 +0000)]
Mathieu Chartier [Wed, 29 Apr 2015 00:10:10 +0000 (00:10 +0000)]
am
e343d613: Merge "Properly describe exception"
* commit '
e343d61319b96011b684e77a2bedcc62d276eef4':
Properly describe exception
Mathieu Chartier [Tue, 28 Apr 2015 23:45:25 +0000 (23:45 +0000)]
Merge "Fix build"
Mathieu Chartier [Tue, 28 Apr 2015 23:43:57 +0000 (16:43 -0700)]
Fix build
Change-Id: Ie056247ee9c4ae7693f3f5f5f68d4322546ee61a
Mathieu Chartier [Tue, 28 Apr 2015 23:40:31 +0000 (23:40 +0000)]
Merge "Properly describe exception"
Mathieu Chartier [Tue, 28 Apr 2015 23:30:30 +0000 (16:30 -0700)]
Properly describe exception
Previously we used DetachCurrentThread which raised a SIGABRT from
within ART. The new approach is to use ExceptionDescribe and exit.
Bug:
20640601
Change-Id: Ia6c2345b656b2ada29d262399798a6ed717a7f85
Jun Mukai [Tue, 28 Apr 2015 21:53:53 +0000 (21:53 +0000)]
Merge "Expand the notification panel by Meta-N."
Chad Brubaker [Tue, 28 Apr 2015 21:46:23 +0000 (21:46 +0000)]
am
37cee0ac: am
481f22ec: Merge "Add OP_AUTH_NEEDED KeyStore result code"
* commit '
37cee0ac7219baaedf380c87b24583df945676cb':
Add OP_AUTH_NEEDED KeyStore result code
Chad Brubaker [Tue, 28 Apr 2015 21:33:48 +0000 (21:33 +0000)]
am
481f22ec: Merge "Add OP_AUTH_NEEDED KeyStore result code"
* commit '
481f22ecda189554b31a8967c3c42a0877458d61':
Add OP_AUTH_NEEDED KeyStore result code
Chad Brubaker [Tue, 28 Apr 2015 20:34:29 +0000 (20:34 +0000)]
Merge "Add OP_AUTH_NEEDED KeyStore result code"
Jun Mukai [Thu, 23 Apr 2015 21:09:34 +0000 (14:09 -0700)]
Expand the notification panel by Meta-N.
Bug:
16351826
Change-Id: Ib33f2a3fee385ecb44e1e331e34dd9b2d6dee4aa
Yin-Chia Yeh [Tue, 28 Apr 2015 18:39:53 +0000 (18:39 +0000)]
am
0671966c: am
1fe9666c: am
5af4cc39: Merge "Camera: document supported templates" into mnc-dev
* commit '
0671966cabd808c7f54cee684018084abe386634':
Camera: document supported templates
Amit Mahajan [Tue, 28 Apr 2015 18:39:48 +0000 (18:39 +0000)]
am
f2c5566f: am
ce8e20ce: am
e3e60ebc: Merge "Revert "Adding logging to debug SignalStrength callback missing issue."" into mnc-dev
* commit '
f2c5566f32e262c4ea61a42f3b11b5f9116c648e':
Revert "Adding logging to debug SignalStrength callback missing issue."
Alan Viverette [Tue, 28 Apr 2015 18:39:37 +0000 (18:39 +0000)]
am
c5378645: am
e8518e7e: am
f8fdf87c: Merge "Fix handling of android:onClick for ContextWrapper" into mnc-dev
* commit '
c537864580bbb3e272f9e227eba52523c6323731':
Fix handling of android:onClick for ContextWrapper
Amith Yamasani [Tue, 28 Apr 2015 18:39:32 +0000 (18:39 +0000)]
am
3346930f: am
1a7a7383: am
c1ce0bbd: Merge "Mark actually seen notifications as seen" into mnc-dev
* commit '
3346930f07516a0cbc2f877d6fbe80cce3f1f227':
Mark actually seen notifications as seen
Zhijun He [Tue, 28 Apr 2015 18:39:26 +0000 (18:39 +0000)]
am
e2757f52: am
44e5fe6c: am
513f7c33: Camera2: add max capture stall for reprocess
* commit '
e2757f52088831aa08bebc57c591c4844a5db5f9':
Camera2: add max capture stall for reprocess
Paul McLean [Tue, 28 Apr 2015 18:26:10 +0000 (18:26 +0000)]
Merge "AudioRecord device select continued" into mnc-dev
Yin-Chia Yeh [Tue, 28 Apr 2015 18:20:09 +0000 (18:20 +0000)]
am
1fe9666c: am
5af4cc39: Merge "Camera: document supported templates" into mnc-dev
* commit '
1fe9666c669f3fefa5f980983f865f2e6934f0aa':
Camera: document supported templates
Amit Mahajan [Tue, 28 Apr 2015 18:20:03 +0000 (18:20 +0000)]
am
ce8e20ce: am
e3e60ebc: Merge "Revert "Adding logging to debug SignalStrength callback missing issue."" into mnc-dev
* commit '
ce8e20cef9b8e79f456a8739d50a74c6f20a03f3':
Revert "Adding logging to debug SignalStrength callback missing issue."
Alan Viverette [Tue, 28 Apr 2015 18:19:58 +0000 (18:19 +0000)]
am
e8518e7e: am
f8fdf87c: Merge "Fix handling of android:onClick for ContextWrapper" into mnc-dev
* commit '
e8518e7ee729597d2b2141c0c4aba695eb529028':
Fix handling of android:onClick for ContextWrapper
Amith Yamasani [Tue, 28 Apr 2015 18:19:52 +0000 (18:19 +0000)]
am
1a7a7383: am
c1ce0bbd: Merge "Mark actually seen notifications as seen" into mnc-dev
* commit '
1a7a73838567672e16ab78f673d9569c52c9c833':
Mark actually seen notifications as seen
Zhijun He [Tue, 28 Apr 2015 18:19:47 +0000 (18:19 +0000)]
am
44e5fe6c: am
513f7c33: Camera2: add max capture stall for reprocess
* commit '
44e5fe6c6c241a4f1d46bdb59f45decd756257e4':
Camera2: add max capture stall for reprocess
Yin-Chia Yeh [Tue, 28 Apr 2015 18:12:10 +0000 (18:12 +0000)]
am
5af4cc39: Merge "Camera: document supported templates" into mnc-dev
* commit '
5af4cc3922e8e1b6e1c89ee438c40c89980583ac':
Camera: document supported templates
Amit Mahajan [Tue, 28 Apr 2015 18:12:05 +0000 (18:12 +0000)]
am
e3e60ebc: Merge "Revert "Adding logging to debug SignalStrength callback missing issue."" into mnc-dev
* commit '
e3e60ebc36b1dcbb085ebe33e04cb6b83c610832':
Revert "Adding logging to debug SignalStrength callback missing issue."
Alan Viverette [Tue, 28 Apr 2015 18:00:19 +0000 (18:00 +0000)]
am
f8fdf87c: Merge "Fix handling of android:onClick for ContextWrapper" into mnc-dev
* commit '
f8fdf87c060fa77a1910d8b6f4b6d26c83963033':
Fix handling of android:onClick for ContextWrapper
Amith Yamasani [Tue, 28 Apr 2015 18:00:14 +0000 (18:00 +0000)]
am
c1ce0bbd: Merge "Mark actually seen notifications as seen" into mnc-dev
* commit '
c1ce0bbd149600fff3c7bada1c13bb00ccdbea1d':
Mark actually seen notifications as seen
Zhijun He [Tue, 28 Apr 2015 18:00:08 +0000 (18:00 +0000)]
am
513f7c33: Camera2: add max capture stall for reprocess
* commit '
513f7c33eae0084ecd70062d660f2b873032d895':
Camera2: add max capture stall for reprocess
Wale Ogunwale [Tue, 28 Apr 2015 17:57:49 +0000 (17:57 +0000)]
am
ac074435: am
fe4680f9: am
354b70f7: Merge "Set non-starting visible resumed activity as resumed activity for the stack" into mnc-dev
* commit '
ac074435f90783200ed551b419a8178bc88ea16e':
Set non-starting visible resumed activity as resumed activity for the stack
Yin-Chia Yeh [Tue, 28 Apr 2015 17:55:13 +0000 (17:55 +0000)]
Merge "Camera: document supported templates" into mnc-dev
Yin-Chia Yeh [Sat, 25 Apr 2015 00:48:04 +0000 (17:48 -0700)]
Camera: document supported templates
Bug:
20264663
Change-Id: I6fee34a337bccb61aa563903032f9e2c13bf65e0
Amit Mahajan [Tue, 28 Apr 2015 17:53:14 +0000 (17:53 +0000)]
Merge "Revert "Adding logging to debug SignalStrength callback missing issue."" into mnc-dev
Amit Mahajan [Mon, 27 Apr 2015 22:58:29 +0000 (22:58 +0000)]
Revert "Adding logging to debug SignalStrength callback missing issue."
This reverts commit
6ba726f825162481644df89cf0754f4e20f2793e.
Bug:
20444738
Change-Id: Idf118b259cfd3854feac851b9532d4fff1d74985
Alan Viverette [Tue, 28 Apr 2015 17:49:19 +0000 (17:49 +0000)]
Merge "Fix handling of android:onClick for ContextWrapper" into mnc-dev
Amith Yamasani [Tue, 28 Apr 2015 17:48:15 +0000 (17:48 +0000)]
Merge "Mark actually seen notifications as seen" into mnc-dev
Alan Viverette [Tue, 28 Apr 2015 17:47:08 +0000 (17:47 +0000)]
am
5b276f1c: am
6af08c6b: Merge "Fix for infinite loop in RemoteViewsAdapter"
* commit '
5b276f1c03ea85bb7c5e81223b6fdd5d6beb5231':
Fix for infinite loop in RemoteViewsAdapter
Joe Fernandez [Tue, 28 Apr 2015 17:47:03 +0000 (17:47 +0000)]
am
322e15a8: am
cd3793c6: am
e658285b: am
03cbc278: am
0312f377: Merge "docs: Modify Branding guidelines for Android form factors" into lmp-mr1-ub-docs
* commit '
322e15a859f19a4ca150e902a0a1642fb210a62d':
docs: Modify Branding guidelines for Android form factors
Wale Ogunwale [Tue, 28 Apr 2015 17:46:58 +0000 (17:46 +0000)]
am
fe4680f9: am
354b70f7: Merge "Set non-starting visible resumed activity as resumed activity for the stack" into mnc-dev
* commit '
fe4680f9da7cb428af58f07978f1ef3125c0dad5':
Set non-starting visible resumed activity as resumed activity for the stack
Zhijun He [Sat, 25 Apr 2015 01:23:54 +0000 (18:23 -0700)]
Camera2: add max capture stall for reprocess
Bug:
19988710
Change-Id: I05bf3f72fdd54127d9aaa1583e9b0903be94c310
Alan Viverette [Tue, 28 Apr 2015 17:40:05 +0000 (17:40 +0000)]
am
6af08c6b: Merge "Fix for infinite loop in RemoteViewsAdapter"
* commit '
6af08c6b7693b4329184c9cccbc474a0b6a9ea5c':
Fix for infinite loop in RemoteViewsAdapter
Jeff Davidson [Tue, 28 Apr 2015 17:38:10 +0000 (17:38 +0000)]
Merge "Fix incorrect getType signature/implementation in doc."
Marco Nelissen [Tue, 28 Apr 2015 17:32:29 +0000 (17:32 +0000)]
am
6cbaa773: Merge "resolved conflicts for merge of
375e21f8 to mnc-dev-plus-aosp" into mnc-dev-plus-aosp
* commit '
6cbaa773bdfce3c09523d0a0c038648187d3812d':
Sometimes the application context is null
Svet Ganov [Tue, 28 Apr 2015 17:32:24 +0000 (17:32 +0000)]
am
7df31b65: am
565d274f: am
340b198c: Merge "Handle null projection properly if provider app op is not enabled." into mnc-dev
* commit '
7df31b659ef8bd8975e1433b0ec9e4499bdf3c93':
Handle null projection properly if provider app op is not enabled.
dcashman [Tue, 28 Apr 2015 17:32:15 +0000 (17:32 +0000)]
am
22a257db: am
59f9592f: am
2301174e: Merge "Add KeySetManagerService unit tests." into mnc-dev
* commit '
22a257db8046c4cc08940d4198c0ba12fddd280b':
Add KeySetManagerService unit tests.
dcashman [Tue, 28 Apr 2015 17:32:10 +0000 (17:32 +0000)]
am
f99f2e74: am
1ea5067e: am
e12f23dc: Merge "Remove static modifier from KeySetManagerService issuedIds." into mnc-dev
* commit '
f99f2e746cfcdb02230e1a9c244a7051f395d31d':
Remove static modifier from KeySetManagerService issuedIds.
Wale Ogunwale [Tue, 28 Apr 2015 17:29:46 +0000 (17:29 +0000)]
am
354b70f7: Merge "Set non-starting visible resumed activity as resumed activity for the stack" into mnc-dev
* commit '
354b70f7d209e79e4442d4b70fb1d849163eae3d':
Set non-starting visible resumed activity as resumed activity for the stack
Joe Fernandez [Tue, 28 Apr 2015 17:28:28 +0000 (17:28 +0000)]
am
cd3793c6: am
e658285b: am
03cbc278: am
0312f377: Merge "docs: Modify Branding guidelines for Android form factors" into lmp-mr1-ub-docs
* commit '
cd3793c6f20048ce7278f749b35c5788f2a86852':
docs: Modify Branding guidelines for Android form factors
Amith Yamasani [Tue, 28 Apr 2015 17:28:09 +0000 (10:28 -0700)]
Mark actually seen notifications as seen
This was missing from a previous CL that was meant to have it.
Change-Id: I856cee8708d988630778ba88b70deaad8730fc1f
Jeff Davidson [Wed, 4 Feb 2015 19:16:23 +0000 (11:16 -0800)]
Fix incorrect getType signature/implementation in doc.
The method is missing the Uri parameter and the implementation is
both inefficient and unnecessary. It is documented as fine to
return null in getType.
Change-Id: I78c83918916ca5ef28172e544d9ddc9c3695444d
Paul McLean [Fri, 24 Apr 2015 20:01:29 +0000 (14:01 -0600)]
AudioRecord device select continued
Change-Id: I3b6ace370b878351d98dbdcba2db718b30de2f27
Joe Fernandez [Tue, 28 Apr 2015 17:14:34 +0000 (17:14 +0000)]
am
e658285b: am
03cbc278: am
0312f377: Merge "docs: Modify Branding guidelines for Android form factors" into lmp-mr1-ub-docs
* commit '
e658285baf86a223ad369851d1fc5ebacad7b408':
docs: Modify Branding guidelines for Android form factors
Wale Ogunwale [Tue, 28 Apr 2015 17:12:46 +0000 (17:12 +0000)]
Merge "Set non-starting visible resumed activity as resumed activity for the stack" into mnc-dev
Alan Viverette [Tue, 28 Apr 2015 17:10:40 +0000 (17:10 +0000)]
Merge "Fix for infinite loop in RemoteViewsAdapter"
Joe Fernandez [Tue, 28 Apr 2015 17:02:34 +0000 (17:02 +0000)]
am
03cbc278: am
0312f377: Merge "docs: Modify Branding guidelines for Android form factors" into lmp-mr1-ub-docs
* commit '
03cbc27845d6622c8eb7c033ec18dc535ab5d7e4':
docs: Modify Branding guidelines for Android form factors
Joe Fernandez [Tue, 28 Apr 2015 16:46:36 +0000 (16:46 +0000)]
am
0312f377: Merge "docs: Modify Branding guidelines for Android form factors" into lmp-mr1-ub-docs
* commit '
0312f37785768d7931e81afe92dbeda11f132d50':
docs: Modify Branding guidelines for Android form factors
Marco Nelissen [Tue, 28 Apr 2015 16:45:50 +0000 (16:45 +0000)]
Merge "resolved conflicts for merge of
375e21f8 to mnc-dev-plus-aosp" into mnc-dev-plus-aosp
Marco Nelissen [Tue, 28 Apr 2015 16:42:54 +0000 (09:42 -0700)]
resolved conflicts for merge of
375e21f8 to mnc-dev-plus-aosp
Change-Id: I5681890381beed09e8719b066d0c37accae1658d
Svet Ganov [Tue, 28 Apr 2015 16:32:25 +0000 (16:32 +0000)]
am
565d274f: am
340b198c: Merge "Handle null projection properly if provider app op is not enabled." into mnc-dev
* commit '
565d274f3042c5573fb6fc2623876328f498091e':
Handle null projection properly if provider app op is not enabled.
Joe Fernandez [Tue, 28 Apr 2015 16:21:55 +0000 (16:21 +0000)]
Merge "docs: Modify Branding guidelines for Android form factors" into lmp-mr1-ub-docs
Svet Ganov [Tue, 28 Apr 2015 16:20:43 +0000 (16:20 +0000)]
am
340b198c: Merge "Handle null projection properly if provider app op is not enabled." into mnc-dev
* commit '
340b198ccbd1a05e67d586c345139617d4b84ce0':
Handle null projection properly if provider app op is not enabled.
Svet Ganov [Tue, 28 Apr 2015 16:03:53 +0000 (16:03 +0000)]
Merge "Handle null projection properly if provider app op is not enabled." into mnc-dev
dcashman [Tue, 28 Apr 2015 15:33:51 +0000 (15:33 +0000)]
am
59f9592f: am
2301174e: Merge "Add KeySetManagerService unit tests." into mnc-dev
* commit '
59f9592ff485de382abd4dfcdf04f0dd54fc7199':
Add KeySetManagerService unit tests.
dcashman [Tue, 28 Apr 2015 15:33:46 +0000 (15:33 +0000)]
am
1ea5067e: am
e12f23dc: Merge "Remove static modifier from KeySetManagerService issuedIds." into mnc-dev
* commit '
1ea5067e0a85982670c8072762af5308b9a8fb57':
Remove static modifier from KeySetManagerService issuedIds.
Marco Nelissen [Tue, 28 Apr 2015 15:26:52 +0000 (15:26 +0000)]
Merge "Sometimes the application context is null"
Geoff Mendal [Tue, 28 Apr 2015 15:16:54 +0000 (15:16 +0000)]
am
55f6979a: (-s ours) am
d34e8ebc: (-s ours) am
5d3249d6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
55f6979a5ff52de6004e003404546cf137e50379':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 28 Apr 2015 15:16:50 +0000 (15:16 +0000)]
am
e339075a: (-s ours) am
c0aba5f7: (-s ours) am
5e43ae9c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
e339075aa2f9f614419bcbdefbacd3b507ea0551':
Import translations. DO NOT MERGE
Dongwon Kang [Tue, 28 Apr 2015 15:16:45 +0000 (15:16 +0000)]
am
66466068: am
2be6622b: am
99f6c2a0: Merge "TIF: add new audio modes to the timeShiftSetPlaybackRate() javadoc." into mnc-dev
* commit '
664660686a410b09e2126408119cd7088cd03911':
TIF: add new audio modes to the timeShiftSetPlaybackRate() javadoc.
Martijn Coenen [Tue, 28 Apr 2015 15:16:41 +0000 (15:16 +0000)]
am
f4476e67: (-s ours) am
cfbedfee: am
e48cca2a: Merge "Fix vmalloc memory accounting (DO NOT MERGE)." into mnc-dev
* commit '
f4476e67df4bcb4b43a0e921a37a4d32f861a3fd':
Fix vmalloc memory accounting (DO NOT MERGE).
Keisuke Kuroyanagi [Tue, 28 Apr 2015 15:16:36 +0000 (15:16 +0000)]
am
716a5690: am
a3a411ec: am
d2b9bd80: Merge "Fix: End handle disappears when the selection is short." into mnc-dev
* commit '
716a569053e9a58caad7a0ca68797dad786713ad':
Fix: End handle disappears when the selection is short.
Geoff Mendal [Tue, 28 Apr 2015 15:16:31 +0000 (15:16 +0000)]
am
a8f1068b: (-s ours) am
3f98c14d: (-s ours) am
7bdd6aa1: (-s ours) Import translations. DO NOT MERGE
* commit '
a8f1068b47bd369c719eee2ca199bc387ad1af48':
Import translations. DO NOT MERGE
Joe Fernandez [Tue, 28 Apr 2015 15:16:26 +0000 (15:16 +0000)]
am
13654aae: am
203c0a1c: am
f488985d: am
ff31bb4b: am
68ef9287: Merge "docs: Add note about overriding onConnectedNodes() when listening for capability node changes." into lmp-mr1-ub-docs
* commit '
13654aae27e7a4ec1e632cbc87aae5814cf7fb95':
docs: Add note about overriding onConnectedNodes() when listening for capability node changes.
Joe Fernandez [Tue, 28 Apr 2015 15:16:14 +0000 (15:16 +0000)]
am
467a1a68: am
c70f95a3: am
d602d23f: am
80d19484: am
185002bc: Merge "docs: Update Wearable API setup to mention addApiIfAvailable()." into lmp-mr1-ub-docs
* commit '
467a1a689a817678f99e3ec8ba3b2fc1a32c79cb':
docs: Update Wearable API setup to mention addApiIfAvailable().
Robert Shih [Tue, 28 Apr 2015 15:16:09 +0000 (15:16 +0000)]
am
8bf6e936: am
ce1ff57f: am
43429656: Merge "MediaController: workaround to disable seek" into mnc-dev
* commit '
8bf6e93698b056a3ffb4665dbfd79f5a393b8601':
MediaController: workaround to disable seek
Alan Viverette [Tue, 28 Apr 2015 15:16:03 +0000 (15:16 +0000)]
am
e18ce45c: am
aacb04ca: am
1ce80dc0: Merge "Add some missing Settings and DayNight themes" into mnc-dev
* commit '
e18ce45c135df5d0bd1f6650e79802998bde554d':
Add some missing Settings and DayNight themes
Deepanshu Gupta [Tue, 28 Apr 2015 15:15:57 +0000 (15:15 +0000)]
am
cb8ca207: am
9014b31f: am
8381e2cd: Merge "Fix view outline for shadows in LayoutLib." into mnc-dev
* commit '
cb8ca207580ddda501336f77f7d1c39519524320':
Fix view outline for shadows in LayoutLib.
Raph Levien [Tue, 28 Apr 2015 15:15:50 +0000 (15:15 +0000)]
am
1872a3dd: am
33d77e18: am
a589368a: Merge "Expose drawTextRun publicly" into mnc-dev
* commit '
1872a3ddf5f25c62bd5785985d22f4d1f4e22fd9':
Expose drawTextRun publicly
Yorke Lee [Tue, 28 Apr 2015 15:15:44 +0000 (15:15 +0000)]
am
eeb7a7de: am
5e4b0843: am
d0922ed7: Merge "Rename setDefaultDialerApplication for consistency" into mnc-dev
* commit '
eeb7a7de75f65924bb8b832fddaaa853566ebd7f':
Rename setDefaultDialerApplication for consistency
Cedric Ho [Tue, 28 Apr 2015 15:15:39 +0000 (15:15 +0000)]
am
4df4f382: am
452304f7: am
25d12e3f: Merge "resolved conflicts for merge of
0af3af03 to mnc-dev" into mnc-dev
* commit '
4df4f382659c1b79af7d9210a029210c789d6e0a':
Enable VoiceInteractionService on watch.
Yorke Lee [Tue, 28 Apr 2015 15:15:33 +0000 (15:15 +0000)]
am
9be930c1: am
528887b2: am
c0f705a8: Merge "Add utility method isDefaultOrSystemDialer" into mnc-dev
* commit '
9be930c101f099edd439f72268ba41ba5ade4453':
Add utility method isDefaultOrSystemDialer
Chris Craik [Tue, 28 Apr 2015 15:15:27 +0000 (15:15 +0000)]
am
82f5922b: am
15a0616d: am
3d80f4a6: Merge "Anti-alias by default" into mnc-dev
* commit '
82f5922bba76e07ac797dd043f564c819a880686':
Anti-alias by default
Chris Craik [Tue, 28 Apr 2015 15:15:21 +0000 (15:15 +0000)]
am
afc9931c: am
695b37cb: am
ba061aec: Merge "Promote RenderProperties with an alpha to have a RenderLayer" into mnc-dev
* commit '
afc9931c62789332ab670963a7fe857b3c0f6ddd':
Promote RenderProperties with an alpha to have a RenderLayer
Dan Stoza [Tue, 28 Apr 2015 15:15:15 +0000 (15:15 +0000)]
am
0e001fce: am
692f288a: am
e54fbaa2: Merge "ImageWriter: Change detach to sp<GraphicBuffer>" into mnc-dev
* commit '
0e001fce7d0886903aef068d4557f8b73db61cc5':
ImageWriter: Change detach to sp<GraphicBuffer>
Adam Powell [Tue, 28 Apr 2015 15:15:10 +0000 (15:15 +0000)]
am
03b0f717: am
7c420307: am
580c30a6: Merge "Wire up caller chooser targets for ChooserActivity" into mnc-dev
* commit '
03b0f717ca8f78f5f905c62987f73732b11663f7':
Wire up caller chooser targets for ChooserActivity
Svet Ganov [Tue, 28 Apr 2015 15:15:06 +0000 (15:15 +0000)]
am
ca6edcf2: (-s ours) am
87e96b66: am
1f0943dd: Merge "DO NOT MERGE Do not clean up global/system settings on package unintalls." into mnc-dev
* commit '
ca6edcf22ec6879ec19e12904400be818b09c424':
DO NOT MERGE Do not clean up global/system settings on package unintalls.
Arunesh Mishra [Tue, 28 Apr 2015 15:14:59 +0000 (15:14 +0000)]
am
7b0ae63a: am
371dd500: am
c83d46a2: Merge "Add near-ultrasound properties to AudioManager.java" into mnc-dev
* commit '
7b0ae63a99d1aa00d8715f6bc09107fd05a6ebae':
Add near-ultrasound properties to AudioManager.java
Scott Rowe [Tue, 28 Apr 2015 15:14:54 +0000 (15:14 +0000)]
am
8d7f34a1: am
5c4eb380: am
cc637ab0: am
7f2e8cdc: am
63604283: am
02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '
8d7f34a1e011e8cb770f73dead14007504c07d0a':
Andrew Solovay [Tue, 28 Apr 2015 15:14:49 +0000 (15:14 +0000)]
am
dd34c572: am
5ba6a768: am
b005be69: am
ec472abf: am
44199d26: am
5b3152cf: Merge "Docs: Correcting section on how to escape quotes in strings." into lmp-docs
* commit '
dd34c572b508871823df83110bef551ef4b8dfd2':
Andrew Solovay [Tue, 28 Apr 2015 15:14:44 +0000 (15:14 +0000)]
am
cea3a519: am
b7b997e6: am
0d59144c: am
bd719d7b: am
19bc81db: am
09cf4d50: Merge "docs: Update to doc on listening for restrictions-changed intent" into lmp-docs
* commit '
cea3a5196544024700d59703703db48efabc0994':
Quddus Chong [Tue, 28 Apr 2015 15:14:39 +0000 (15:14 +0000)]
am
0bba2cc9: am
b6dd8354: am
a7db8bcb: am
5edfdac4: am
a76a3dd3: (-s ours) am
f0936e2f: (-s ours) Merge "docs: Added 3rd-party Javadocs for GMS Parmesan release." into lmp-docs
* commit '
0bba2cc9db1f55ba8f78c2d6a225401371574cff':
Julia Reynolds [Tue, 28 Apr 2015 15:14:32 +0000 (15:14 +0000)]
am
e7691daf: am
89f19371: am
6ab47fc1: Merge "Allow device initializers to set a preferred setup activity." into mnc-dev
* commit '
e7691dafecf60906d3d6660c532917466e5c25d1':
Allow device initializers to set a preferred setup activity.
Benjamin Franz [Tue, 28 Apr 2015 15:14:26 +0000 (15:14 +0000)]
am
518c315a: am
94e3b0c5: am
0c2d0deb: Merge "Introduce disable2 into StatusBarManager" into mnc-dev
* commit '
518c315a7593395b278b03208bad44b158810e6f':
Introduce disable2 into StatusBarManager
Geoff Mendal [Tue, 28 Apr 2015 15:14:21 +0000 (15:14 +0000)]
am
ea07d1cb: (-s ours) am
b268f606: (-s ours) am
d727677d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
ea07d1cbb4df4257fbff3b3fe66bdf84e2c1ea9e':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 28 Apr 2015 15:14:13 +0000 (15:14 +0000)]
am
7825b9d0: (-s ours) am
bbca11e5: (-s ours) am
69812636: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
7825b9d01c4721b5d2134c00521d1d92d1799d94':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 28 Apr 2015 14:55:11 +0000 (14:55 +0000)]
am
d34e8ebc: (-s ours) am
5d3249d6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
d34e8ebc027bb90db5eb66c64d368b6b46aaf397':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 28 Apr 2015 14:55:07 +0000 (14:55 +0000)]
am
c0aba5f7: (-s ours) am
5e43ae9c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
c0aba5f70522088dcaacba59754321f6ce6d61d3':
Import translations. DO NOT MERGE
OSDN Git Service
