OSDN Git Service
Baligh Uddin [Thu, 22 May 2014 03:04:46 +0000 (03:04 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Thu, 22 May 2014 03:04:44 +0000 (03:04 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Quddus Chong [Wed, 21 May 2014 23:39:46 +0000 (23:39 +0000)]
am
a3c773e8: am
539f9e31: docs: Update the sample Gradle dependency declaration to reflect GMS K version.
* commit '
a3c773e836dcb97c7f1045c8347dc7267bd21936':
docs: Update the sample Gradle dependency declaration to reflect GMS K version.
Quddus Chong [Wed, 21 May 2014 23:23:33 +0000 (23:23 +0000)]
am
539f9e31: docs: Update the sample Gradle dependency declaration to reflect GMS K version.
* commit '
539f9e31726dc780f26901de06c35a4b2446c37a':
docs: Update the sample Gradle dependency declaration to reflect GMS K version.
Mindy Pereira [Wed, 21 May 2014 21:54:37 +0000 (21:54 +0000)]
Merge "Make a smaller cliff for dismissing cards" into klp-modular-dev
Quddus Chong [Wed, 21 May 2014 21:34:56 +0000 (14:34 -0700)]
docs: Update the sample Gradle dependency declaration to reflect GMS K version.
Change-Id: I5e5c40974b2fbaf61256d320d24acf5e0e9178d6
Baligh Uddin [Wed, 21 May 2014 21:07:31 +0000 (14:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I39fc3fb7096c632d5856dca116fdacb51ca1701d
Auto-generated-cl: translation import
Baligh Uddin [Wed, 21 May 2014 20:57:22 +0000 (13:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibb49ad5c4d9a81d64086f05d71e0ff769af3177e
Auto-generated-cl: translation import
Jim Miller [Wed, 21 May 2014 20:39:41 +0000 (20:39 +0000)]
am
911176d7: am
607d5998: Fix crash in widget pager - DO NOT MERGE
* commit '
911176d7e6c8ba28ed7f7be63edcb17456f615fe':
Fix crash in widget pager - DO NOT MERGE
Jim Miller [Wed, 21 May 2014 20:35:51 +0000 (20:35 +0000)]
am
607d5998: Fix crash in widget pager - DO NOT MERGE
* commit '
607d59982a046d23770a7289be6272ad5983d6ae':
Fix crash in widget pager - DO NOT MERGE
Vinod Krishnan [Wed, 21 May 2014 17:40:06 +0000 (17:40 +0000)]
Merge "Adding more DeviceDefault for CTS tests" into klp-modular-dev
Vinod Krishnan [Wed, 21 May 2014 17:28:57 +0000 (10:28 -0700)]
Adding more DeviceDefault for CTS tests
Bug:
15091518
Change-Id: Iddabacbd023f031c9c4ec6fd4c4f60ce17b606c4
Dan Sandler [Fri, 16 May 2014 02:22:10 +0000 (22:22 -0400)]
Elide extras strings from noman dumpsys output.
Bug:
14292528
Change-Id: I19cfb6b692e6901fa7f115ea675b1b03fc5ba176
(cherry picked from commit
44de3cfc08428378b93172a2b03f9785a3638678)
Baligh Uddin [Wed, 21 May 2014 15:34:11 +0000 (15:34 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Jeff Brown [Wed, 21 May 2014 05:17:31 +0000 (05:17 +0000)]
Merge "Fix build." into klp-modular-dev
Jeff Brown [Wed, 21 May 2014 05:16:25 +0000 (22:16 -0700)]
Fix build.
Change-Id: I00f040ab16cf8a3b7a995b4626d49e70b97fb294
Jeff Brown [Wed, 21 May 2014 05:09:15 +0000 (05:09 +0000)]
Merge "Defer display ready until brightness ramp completes." into klp-modular-dev
Jeff Brown [Wed, 21 May 2014 05:02:46 +0000 (22:02 -0700)]
Defer display ready until brightness ramp completes.
Bug:
14494096
Change-Id: I6da6fffbbce2c7058170e5c6139eae4cb5a06d88
Jeff Brown [Wed, 21 May 2014 04:28:34 +0000 (04:28 +0000)]
Merge "Make power button behavior configurable." into klp-modular-dev
Jeff Brown [Wed, 21 May 2014 04:24:38 +0000 (21:24 -0700)]
Make power button behavior configurable.
Allow power button to be used to either go to sleep as usual,
which may doze, or skip that completely and really go to sleep.
May also really go to sleep and go home all at once.
Bug:
14406056
Change-Id: Ia19e2551b9c2a72271bb2eddd5c0d1749761e019
Griff Hazen [Wed, 21 May 2014 02:41:01 +0000 (02:41 +0000)]
Merge "Fixes to WearableActionExtensions" into klp-modular-dev
Jeff Brown [Wed, 21 May 2014 02:35:09 +0000 (02:35 +0000)]
Merge "I'm feeling the good vibrations." into klp-modular-dev
Jeff Brown [Wed, 21 May 2014 02:34:25 +0000 (02:34 +0000)]
Merge "Allow display timeouts to be set in config.xml." into klp-modular-dev
Jeff Brown [Wed, 21 May 2014 02:29:29 +0000 (19:29 -0700)]
I'm feeling the good vibrations.
When the device enters a non-interactive state, we normally
cancel all active vibrations as a safety precaution. However if
the system is performing haptic feedback then we want to allow
it to run to completion.
Bug:
14319563
Change-Id: I673781bbf32562e45c1595689e6b423bd178ea73
Dirk Dougherty [Wed, 21 May 2014 02:25:09 +0000 (02:25 +0000)]
am
c1bb79d9: am
bb0b8449: Remove monetization image in edu guidelines.
* commit '
c1bb79d966c5fee256a349d8902c7abd362ddc39':
Remove monetization image in edu guidelines.
Dirk Dougherty [Wed, 21 May 2014 02:20:16 +0000 (02:20 +0000)]
am
bb0b8449: Remove monetization image in edu guidelines.
* commit '
bb0b8449f80338a35768c9264e9c1e5eae54c7fa':
Remove monetization image in edu guidelines.
Dirk Dougherty [Wed, 21 May 2014 02:10:26 +0000 (19:10 -0700)]
Remove monetization image in edu guidelines.
Change-Id: I2cea7a3507eda30ab185560304d64fc455ba19f7
Griff Hazen [Wed, 21 May 2014 01:46:16 +0000 (18:46 -0700)]
Fixes to WearableActionExtensions
* Add missing parcelable creator.
* Review fixes.
* Minor doc fixes.
* Kill SIZE_FULLSCREEN
Change-Id: Iaf6458fdd3482202aa416ebaf2302f79cb48635e
Jeff Brown [Wed, 21 May 2014 00:17:10 +0000 (17:17 -0700)]
Allow display timeouts to be set in config.xml.
Bug:
13671523
Change-Id: I79fc21999bc62743178d2d22071455a0c11070c9
Griff Hazen [Tue, 20 May 2014 20:50:06 +0000 (13:50 -0700)]
Add wearable notification extensions to frameworks/base.
Change-Id: Ic312cec7dc11e637002ff2be3975940a93a6babf
Griff Hazen [Tue, 20 May 2014 19:50:51 +0000 (12:50 -0700)]
Fix sdk docs build for framework from remote input api addition.
Change-Id: I6a6f3df06d924fe72f67466d67d9feced8d8719f
Mindy Pereira [Tue, 20 May 2014 17:19:03 +0000 (10:19 -0700)]
Make a smaller cliff for dismissing cards
Fixes b/
14997474 swipe to dismiss cliff guard may be too big
Change-Id: I3e681f1c6dc3eaac37a0e840b36f4c7041e86e62
Griff Hazen [Tue, 20 May 2014 16:55:39 +0000 (09:55 -0700)]
Add RemoteInput, Grouping, and Extender to Notification api.
RemoteInputs annotate actions and content intents to request
input from the user as part of an intent being sent. Results
are sent along using ClipData to avoid unparcel of developer
provided bundle values. A helper method is expexted to be used
to extract results.
Grouping allows notifications to be bundled together, with an optional
summary notification for display on older platforms. SortKey is an
important part of grouping since child notifications will likely have
a prescribed ordering. It is also useful in top level notifications
for apps that want to provide an ordering all other fields being equal.
Also provide a fluid way to to extend Actions and Notifications
using Extenders, e.g.:
Notification n = new NotificationCompat.Builder(context)
.setOption1()
.apply(new SomeExtender()
.setOption2())
.build();
This helps extension libraries provide a nice API experience for devs.
Change-Id: Ib3438ef854772c2c34d21bf1eb4ed7c9e032106f
Baligh Uddin [Tue, 20 May 2014 15:27:22 +0000 (08:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I813af1cbb2db0674a3cf81649f0d130ebb2d6164
Auto-generated-cl: translation import
Ben Murdoch [Tue, 20 May 2014 09:32:42 +0000 (09:32 +0000)]
Merge "Add PackagManager flag for WebView system feature." into klp-modular-dev
Guang Zhu [Tue, 20 May 2014 04:36:47 +0000 (04:36 +0000)]
Merge "add a command to list all bonded devices" into klp-modular-dev
Guang Zhu [Tue, 20 May 2014 04:34:25 +0000 (21:34 -0700)]
add a command to list all bonded devices
Bug:
14601515
Change-Id: I3cc5bb664485ef768bb81f1f8870ed9bf62f8329
quddusc [Mon, 19 May 2014 20:58:49 +0000 (20:58 +0000)]
am
f269e732: am
728dbf8c: Merge "docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4)." into klp-docs
* commit '
f269e732bf76d7dc4b37f2ce023684b4fe691c60':
docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4).
Quddus Chong [Mon, 19 May 2014 20:58:41 +0000 (20:58 +0000)]
am
47064793: am
f4b64495: Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docs
* commit '
4706479326789b4b20cc370cdb28c7a0b4f09646':
docs: Updated Javadoc for GMS Kenafa release.
quddusc [Mon, 19 May 2014 20:55:35 +0000 (20:55 +0000)]
am
728dbf8c: Merge "docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4)." into klp-docs
* commit '
728dbf8cc8d6c8a84bf67b8b34295eab4503d230':
docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4).
Quddus Chong [Mon, 19 May 2014 20:55:31 +0000 (20:55 +0000)]
am
f4b64495: Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docs
* commit '
f4b6449515f212642e90e435b2a3a55766a41f9e':
docs: Updated Javadoc for GMS Kenafa release.
quddusc [Mon, 19 May 2014 20:52:05 +0000 (20:52 +0000)]
Merge "docs: Updated Google Play Services highlights and landing pages for Kenafa (Google Play Services v4.4)." into klp-docs
Quddus Chong [Mon, 19 May 2014 20:51:39 +0000 (20:51 +0000)]
Merge "docs: Updated Javadoc for GMS Kenafa release." into klp-docs
Mark Renouf [Mon, 19 May 2014 20:36:40 +0000 (20:36 +0000)]
Merge "Override windowContentOverlay and windowBackground for Theme.Micro.*" into klp-modular-dev
Mark Renouf [Mon, 19 May 2014 17:40:17 +0000 (13:40 -0400)]
Override windowContentOverlay and windowBackground for Theme.Micro.*
Change-Id: Iab40fb70398ad2ce87b613aa9278cb87f7a35d84
Dirk Dougherty [Mon, 19 May 2014 18:08:53 +0000 (18:08 +0000)]
am
4d37d7ef: am
c385b1e4: Merge "Remove neg margin in wear css to resolve layout issue." into klp-docs
* commit '
4d37d7ef141beaf8f7d1b2bf1c19e3fb8c84203f':
Remove neg margin in wear css to resolve layout issue.
Scott Rowe [Mon, 19 May 2014 18:08:45 +0000 (18:08 +0000)]
am
a0144782: am
6d05170a: docs: b/
14510382 ISO language code, add link
* commit '
a0144782b16b5b6a767a0c48fa5c3a79a5c74889':
docs: b/
14510382 ISO language code, add link
Robert Ly [Mon, 19 May 2014 17:56:18 +0000 (17:56 +0000)]
Merge "docs: updates for changes to notification APIs" into klp-modular-dev
Dirk Dougherty [Mon, 19 May 2014 17:27:41 +0000 (17:27 +0000)]
am
c385b1e4: Merge "Remove neg margin in wear css to resolve layout issue." into klp-docs
* commit '
c385b1e4be928133930d9264a92c98f4747adedb':
Remove neg margin in wear css to resolve layout issue.
Dirk Dougherty [Mon, 19 May 2014 17:23:33 +0000 (17:23 +0000)]
Merge "Remove neg margin in wear css to resolve layout issue." into klp-docs
Scott Rowe [Mon, 19 May 2014 17:04:53 +0000 (17:04 +0000)]
am
6d05170a: docs: b/
14510382 ISO language code, add link
* commit '
6d05170a55ac6a9401e6089ba49d675857c3c25d':
docs: b/
14510382 ISO language code, add link
Ben Murdoch [Fri, 16 May 2014 12:45:47 +0000 (13:45 +0100)]
Add PackagManager flag for WebView system feature.
Add a flag for PackageManager.hasSystemFeature to determine
if a functional webview is available on the device.
Bug:
13438487
Change-Id: I770f7e924b3e5fa6be0397904acf18c9306096e4
Ben Murdoch [Mon, 19 May 2014 11:26:31 +0000 (11:26 +0000)]
Merge "Fallback to NullWebView when Chromium WebView not present." into klp-modular-dev
Robert Ly [Sun, 11 May 2014 18:25:35 +0000 (11:25 -0700)]
docs: updates for changes to notification APIs
Change-Id: I8a016b0693e928eb864065bea1079be824987340
Joe LaPenna [Sat, 17 May 2014 01:55:06 +0000 (01:55 +0000)]
Merge "Log accept and close debug statements in BluetoothSocket." into klp-modular-dev
Scott Rowe [Fri, 16 May 2014 21:31:46 +0000 (14:31 -0700)]
docs: b/
14510382 ISO language code, add link
Change-Id: Id78858743b453d9e44624f491db183d9a099a1ce
Jim Miller [Fri, 25 Apr 2014 19:52:00 +0000 (12:52 -0700)]
Fix crash in widget pager - DO NOT MERGE
Fixes bug
14299491
Change-Id: I3c94cbd7f7923dc5a429c9929bc432a5dd29d04f
Quddus Chong [Wed, 7 May 2014 00:02:49 +0000 (17:02 -0700)]
docs: Updated Javadoc for GMS Kenafa release.
Change-Id: Id3b7853282e317c85d58a7d84657e59a0159961d
Griff Hazen [Fri, 16 May 2014 16:46:31 +0000 (09:46 -0700)]
Fix Notification sdk docs build.
Builder#X looked like it was considered ambiguous even though Action
was not in scope. Intellij disagreed but this fixes the issue.
Change-Id: I51fac39b2a4834e25f936c6eae223cda8c9c610e
Ben Murdoch [Fri, 16 May 2014 12:41:12 +0000 (13:41 +0100)]
Fallback to NullWebView when Chromium WebView not present.
If it's not possible to load the Chromium WebView, fallback to loading
the NullWebView that will throw UnsupportedOperationException.
Bug:
13438487
Change-Id: If44b8b7a569c2f8e0e8bba7e6953288802d1c9e0
Griff Hazen [Fri, 16 May 2014 05:26:18 +0000 (22:26 -0700)]
Add support for extendable actions to Notification.
Change-Id: I2945a6994a28fc454af3f84e75c96d7619547f01
Justin Koh [Thu, 15 May 2014 17:17:13 +0000 (17:17 +0000)]
Merge "If there is only 1 simple global action, autolaunch it" into klp-modular-dev
Baligh Uddin [Thu, 15 May 2014 14:26:05 +0000 (14:26 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Dirk Dougherty [Thu, 15 May 2014 03:06:31 +0000 (20:06 -0700)]
Remove neg margin in wear css to resolve layout issue.
Change-Id: I68cc26e55b8bf486a20ec9fa1de48e9caf505165
Ricardo Cervera [Wed, 14 May 2014 23:53:20 +0000 (23:53 +0000)]
am
59ab011e: am
0e286ab1: Merge "docs: Removed outdated troubleshooting guidelines for Android Studio" into klp-docs
* commit '
59ab011eebc5deb008ae62c0fe353d6d0aac8ab8':
docs: Removed outdated troubleshooting guidelines for Android Studio
Ricardo Cervera [Wed, 14 May 2014 23:49:24 +0000 (23:49 +0000)]
am
0e286ab1: Merge "docs: Removed outdated troubleshooting guidelines for Android Studio" into klp-docs
* commit '
0e286ab1f0eaeb2bb75c7a76ff8f3d08267e7fc3':
docs: Removed outdated troubleshooting guidelines for Android Studio
Ricardo Cervera [Wed, 14 May 2014 22:44:56 +0000 (22:44 +0000)]
Merge "docs: Removed outdated troubleshooting guidelines for Android Studio" into klp-docs
Dirk Dougherty [Wed, 14 May 2014 21:21:23 +0000 (21:21 +0000)]
am
980a285b: am
5eb99943: Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs
* commit '
980a285b4c29254fd65b0426256918ae2b5eea85':
update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED.
Dirk Dougherty [Wed, 14 May 2014 21:21:15 +0000 (21:21 +0000)]
am
a4e6c7d1: am
3506ac87: Doc change: Updated content for distribute.
* commit '
a4e6c7d1d4e6c8ca2b50f91ae8881fb4838d7955':
Doc change: Updated content for distribute.
Dirk Dougherty [Wed, 14 May 2014 21:17:27 +0000 (21:17 +0000)]
am
5eb99943: Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs
* commit '
5eb99943d5cf4ad32c61d94e944c155d1c77a915':
update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED.
Dirk Dougherty [Wed, 14 May 2014 21:17:22 +0000 (21:17 +0000)]
am
3506ac87: Doc change: Updated content for distribute.
* commit '
3506ac87c09c0748d92ef594c94365a5d7b07262':
Doc change: Updated content for distribute.
Dirk Dougherty [Wed, 14 May 2014 21:16:31 +0000 (21:16 +0000)]
Merge "update wear reference docs to support sticky nav. DO NOT SUBMIT UNTIL DYNAMIC TEMPLATE IS MERGED." into klp-docs
Dirk Dougherty [Fri, 21 Feb 2014 19:15:52 +0000 (11:15 -0800)]
Doc change: Updated content for distribute.
Change-Id: I612fbb8e5b7aedd73c0e633e5517bb89375760ed
Baligh Uddin [Wed, 14 May 2014 17:44:46 +0000 (10:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I443d4950531e7ab7018cb5db1b8316f1b8baaa9e
Auto-generated-cl: translation import
Justin Koh [Mon, 12 May 2014 23:00:36 +0000 (16:00 -0700)]
If there is only 1 simple global action, autolaunch it
Requested by UX. Also made settings available before provisioning
Bug:
14683740
Bug:
14886954
Change-Id: If62ccc6472a72b7adb4d309ee89e51069f8e0413
Joe LaPenna [Wed, 14 May 2014 01:17:46 +0000 (18:17 -0700)]
Log accept and close debug statements in BluetoothSocket.
Bug:
14902781
Bug:
14784262
Change-Id: Id0c2cd216244e05c218568427bda863a538b1041
Deepanshu Gupta [Wed, 14 May 2014 00:31:20 +0000 (00:31 +0000)]
am
f73dbcc3: am
9916c17e: am
472cbad4: am
f57871f7: am
888dad0d: am
f33a2f62: am
f5af9a4a: am
273c5c3c: am
9ca7a039: resolved conflicts for merge of
e0be42a9 to jb-mr1.1-dev
* commit '
f73dbcc3780fbfb6a9eab7d43aebc3607ad1e8f8':
Fix build due to incorrect merges [DO NOT MERGE]
Deepanshu Gupta [Wed, 14 May 2014 00:31:15 +0000 (00:31 +0000)]
Deepanshu Gupta [Wed, 14 May 2014 00:26:43 +0000 (00:26 +0000)]
am
9916c17e: am
472cbad4: am
f57871f7: am
888dad0d: am
f33a2f62: am
f5af9a4a: am
273c5c3c: am
9ca7a039: resolved conflicts for merge of
e0be42a9 to jb-mr1.1-dev
* commit '
9916c17e6606607bbadacc4fb113018ecb7fcb41':
Fix build due to incorrect merges [DO NOT MERGE]
Deepanshu Gupta [Wed, 14 May 2014 00:26:38 +0000 (00:26 +0000)]
Deepanshu Gupta [Wed, 14 May 2014 00:21:36 +0000 (00:21 +0000)]
am
472cbad4: am
f57871f7: am
888dad0d: am
f33a2f62: am
f5af9a4a: am
273c5c3c: am
9ca7a039: resolved conflicts for merge of
e0be42a9 to jb-mr1.1-dev
* commit '
472cbad479b0f1361c816a2c0d5accb776fa3841':
Fix build due to incorrect merges [DO NOT MERGE]
Deepanshu Gupta [Wed, 14 May 2014 00:21:33 +0000 (00:21 +0000)]
Deepanshu Gupta [Wed, 14 May 2014 00:15:28 +0000 (00:15 +0000)]
am
f57871f7: am
888dad0d: am
f33a2f62: am
f5af9a4a: am
273c5c3c: am
9ca7a039: resolved conflicts for merge of
e0be42a9 to jb-mr1.1-dev
* commit '
f57871f799300614d37e93e376f9381fd01c2bcb':
Fix build due to incorrect merges [DO NOT MERGE]
Deepanshu Gupta [Wed, 14 May 2014 00:15:24 +0000 (00:15 +0000)]
Deepanshu Gupta [Wed, 14 May 2014 00:11:08 +0000 (00:11 +0000)]
am
888dad0d: am
f33a2f62: am
f5af9a4a: am
273c5c3c: am
9ca7a039: resolved conflicts for merge of
e0be42a9 to jb-mr1.1-dev
* commit '
888dad0df765256f4b47268400425103106894f0':
Fix build due to incorrect merges [DO NOT MERGE]
Deepanshu Gupta [Wed, 14 May 2014 00:11:06 +0000 (00:11 +0000)]
Deepanshu Gupta [Wed, 14 May 2014 00:05:38 +0000 (00:05 +0000)]
am
f33a2f62: am
f5af9a4a: am
273c5c3c: am
9ca7a039: resolved conflicts for merge of
e0be42a9 to jb-mr1.1-dev
* commit '
f33a2f62a54ef966375a7fe8706ce713386d843e':
Fix build due to incorrect merges [DO NOT MERGE]
Deepanshu Gupta [Wed, 14 May 2014 00:05:35 +0000 (00:05 +0000)]
Deepanshu Gupta [Wed, 14 May 2014 00:00:08 +0000 (00:00 +0000)]
am
f5af9a4a: am
273c5c3c: am
9ca7a039: resolved conflicts for merge of
e0be42a9 to jb-mr1.1-dev
* commit '
f5af9a4a9a0c0a3bab43235659e3adfa2cebb52f':
Fix build due to incorrect merges [DO NOT MERGE]
Deepanshu Gupta [Wed, 14 May 2014 00:00:05 +0000 (00:00 +0000)]
Deepanshu Gupta [Tue, 13 May 2014 23:55:20 +0000 (23:55 +0000)]
am
273c5c3c: am
9ca7a039: resolved conflicts for merge of
e0be42a9 to jb-mr1.1-dev
* commit '
273c5c3c4c74d29a127e614726ce2e5c5e274c20':
Fix build due to incorrect merges [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 23:55:17 +0000 (23:55 +0000)]
Deepanshu Gupta [Tue, 13 May 2014 23:54:21 +0000 (23:54 +0000)]
am
9ca7a039: resolved conflicts for merge of
e0be42a9 to jb-mr1.1-dev
* commit '
9ca7a039f73e5cf84f85282cf05d637517be2a17':
Fix build due to incorrect merges [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 23:50:44 +0000 (23:50 +0000)]
Deepanshu Gupta [Tue, 13 May 2014 23:48:31 +0000 (16:48 -0700)]
resolved conflicts for merge of
e0be42a9 to jb-mr1.1-dev
Deepanshu Gupta [Tue, 13 May 2014 23:45:30 +0000 (23:45 +0000)]
Deepanshu Gupta [Tue, 13 May 2014 23:40:37 +0000 (23:40 +0000)]
am
40bfb60e: Fix build due to incorrect merges [DO NOT MERGE]
* commit '
40bfb60efa0e92259a417a5cbfd6095759c678b7':
Fix build due to incorrect merges [DO NOT MERGE]
Deepanshu Gupta [Tue, 13 May 2014 23:40:34 +0000 (23:40 +0000)]
Justin Koh [Tue, 13 May 2014 22:48:42 +0000 (15:48 -0700)]
Set KITKAT_WATCH to be level 20, document API specific changes.
Bug:
14116162
Change-Id: Iab094dbd0add414a365234c275bd473787b8803b
Deepanshu Gupta [Tue, 13 May 2014 22:52:39 +0000 (15:52 -0700)]
Fix build due to incorrect merges [DO NOT MERGE]
Change-Id: Ib3b4dafeed6ba4c07450d13d9908fb05a1a4542f