OSDN Git Service
Nick Kralevich [Sat, 5 Jul 2014 16:51:38 +0000 (16:51 +0000)]
am
23219098: am
b70888d4: Merge "Fix a typo in a javadoc comment"
* commit '
23219098a6d623cf1825d8fd9a8d200cdc06aab9':
Fix a typo in a javadoc comment
Nick Kralevich [Sat, 5 Jul 2014 16:51:32 +0000 (16:51 +0000)]
am
dbb32da8: am
c9eff23b: Merge "Fix typo in DevicePolicyManager documentation"
* commit '
dbb32da844cf8ed65d0b5005276a86aad7c81853':
Fix typo in DevicePolicyManager documentation
Nick Kralevich [Sat, 5 Jul 2014 16:45:31 +0000 (16:45 +0000)]
am
b70888d4: Merge "Fix a typo in a javadoc comment"
* commit '
b70888d45573c015fbb9d584df575bf78f5e9684':
Fix a typo in a javadoc comment
Nick Kralevich [Sat, 5 Jul 2014 16:45:26 +0000 (16:45 +0000)]
am
c9eff23b: Merge "Fix typo in DevicePolicyManager documentation"
* commit '
c9eff23b443f26fb8c4873a6ecb61eded0564163':
Fix typo in DevicePolicyManager documentation
Nick Kralevich [Sat, 5 Jul 2014 16:40:59 +0000 (16:40 +0000)]
am
58005ec5: am
3b345a6f: Merge "Fix javadoc typo in Message.java: "arg1" -> "arg2""
* commit '
58005ec545fd011418b6400a3b377fea6928c933':
Fix javadoc typo in Message.java: "arg1" -> "arg2"
Nick Kralevich [Sat, 5 Jul 2014 16:35:13 +0000 (16:35 +0000)]
am
3b345a6f: Merge "Fix javadoc typo in Message.java: "arg1" -> "arg2""
* commit '
3b345a6f9103c1677a696b4770cc318df45cdcaa':
Fix javadoc typo in Message.java: "arg1" -> "arg2"
Nick Kralevich [Sat, 5 Jul 2014 16:27:14 +0000 (16:27 +0000)]
am
aa4ff2ef: am
eb822cec: Merge "Typo fix in permission string"
* commit '
aa4ff2efecb1aa03b6a6843bf8a4c19b885db4fc':
Typo fix in permission string
Nick Kralevich [Sat, 5 Jul 2014 16:22:17 +0000 (16:22 +0000)]
am
eb822cec: Merge "Typo fix in permission string"
* commit '
eb822cecdb128cb0a00f361b87b8378d5664a458':
Typo fix in permission string
Narayan Kamath [Fri, 4 Jul 2014 09:23:55 +0000 (09:23 +0000)]
am
29a9d27d: am
358a3f71: Merge "fix AudioTrack and AudioRecord JNI"
* commit '
29a9d27d3c9224a7709a41096d7a958c8177ac19':
fix AudioTrack and AudioRecord JNI
Narayan Kamath [Fri, 4 Jul 2014 09:22:57 +0000 (09:22 +0000)]
am
5ae312fb: am
759e0d6a: Merge "Fix LocalePicker locale filtering."
* commit '
5ae312fb5b601d2c60e197f94c6a292700776140':
Fix LocalePicker locale filtering.
Narayan Kamath [Fri, 4 Jul 2014 08:49:02 +0000 (08:49 +0000)]
am
358a3f71: Merge "fix AudioTrack and AudioRecord JNI"
* commit '
358a3f716850e96716b766c63d50d3425a4c9ed7':
fix AudioTrack and AudioRecord JNI
Narayan Kamath [Fri, 4 Jul 2014 08:48:58 +0000 (08:48 +0000)]
am
759e0d6a: Merge "Fix LocalePicker locale filtering."
* commit '
759e0d6a7a258dbc34a38a7db320827eb9144487':
Fix LocalePicker locale filtering.
Narayan Kamath [Fri, 4 Jul 2014 08:23:08 +0000 (08:23 +0000)]
Merge "Fix LocalePicker locale filtering."
Narayan Kamath [Thu, 3 Jul 2014 12:26:07 +0000 (13:26 +0100)]
Fix LocalePicker locale filtering.
This was broken by commit
b27c137087ee92674 which
removed a badly phrased check. Prior to that commit,
there was a check that excluded locales whose toString()
length was not 5.
This change reinstates that check in a less roundabout
way, by excluding BCP-47 tags that don't have a country
subtag.
bug:
16038949
Change-Id: Ic24b1df87b2e2ce47d9ae04c7759088721f27b4f
Brian Duff [Thu, 3 Jul 2014 09:43:56 +0000 (09:43 +0000)]
am
c542745e: am
a6e9dd3f: Merge "Fix a typo in NumberPicker javadoc."
* commit '
c542745e23fe9d2e71c1f607d66f5570f585133d':
Fix a typo in NumberPicker javadoc.
Brian Duff [Thu, 3 Jul 2014 06:45:04 +0000 (06:45 +0000)]
am
a6e9dd3f: Merge "Fix a typo in NumberPicker javadoc."
* commit '
a6e9dd3f9a2d966faf2d1710d2189127b968dc52':
Fix a typo in NumberPicker javadoc.
Nick Kralevich [Sat, 5 Jul 2014 16:40:50 +0000 (16:40 +0000)]
Merge "Fix typo in DevicePolicyManager documentation"
Nick Kralevich [Sat, 5 Jul 2014 16:18:31 +0000 (16:18 +0000)]
Merge "Typo fix in permission string"
Jason Sams [Wed, 2 Jul 2014 21:32:05 +0000 (14:32 -0700)]
Resolve conflicts with AOSP.
Change-Id: I2f1afdb83dcfc9078df5d3c2f13abacb6504d73d
Narayan Kamath [Fri, 4 Jul 2014 08:41:17 +0000 (08:41 +0000)]
Merge "fix AudioTrack and AudioRecord JNI"
Eric Laurent [Wed, 30 Apr 2014 18:59:21 +0000 (11:59 -0700)]
fix AudioTrack and AudioRecord JNI
AudioTrack and AudioRecord JNI should not cast
jshortArray to jbyteArray. This appeared to work with Dalvik
but causes data corruption with ART.
(cherry picked from commit
9d02848e902d04417df616354db3a18c03e639b7)
Change-Id: Ie36624d3ea06042373c64edced4b5e30b7b1ee86
Nick Kralevich [Sat, 5 Jul 2014 16:41:54 +0000 (16:41 +0000)]
Merge "Fix a typo in a javadoc comment"
Nick Kralevich [Sat, 5 Jul 2014 16:30:08 +0000 (16:30 +0000)]
Merge "Fix javadoc typo in Message.java: "arg1" -> "arg2""
Brian Duff [Thu, 3 Jul 2014 06:05:07 +0000 (06:05 +0000)]
Merge "Fix a typo in NumberPicker javadoc."
Baligh Uddin [Wed, 2 Jul 2014 15:08:10 +0000 (15:08 +0000)]
am
e1ef888e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
e1ef888eac66c247710833746f7e8e2fc1f45c1b':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 2 Jul 2014 15:08:06 +0000 (15:08 +0000)]
am
48f89343: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
48f89343d9abdaa81dcdbebd7a15b2b313d67aa7':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 2 Jul 2014 15:08:02 +0000 (15:08 +0000)]
am
caaf4aed: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
caaf4aed05163df62365d351e592083ba95102cd':
Import translations. DO NOT MERGE
Narayan Kamath [Wed, 2 Jul 2014 12:18:45 +0000 (12:18 +0000)]
am
e2840977: am
6e84f8c1: Merge "Fix native crashes when APKs can\'t be opened."
* commit '
e2840977d37e4d19425d448b54895536e43a2989':
Fix native crashes when APKs can't be opened.
Narayan Kamath [Wed, 2 Jul 2014 12:12:18 +0000 (12:12 +0000)]
am
6e84f8c1: Merge "Fix native crashes when APKs can\'t be opened."
* commit '
6e84f8c1b9c72ab6e1eb189358292237dbe1efe8':
Fix native crashes when APKs can't be opened.
Narayan Kamath [Wed, 2 Jul 2014 10:09:45 +0000 (10:09 +0000)]
am
39e4f590: am
f56399f6: Merge "Fall back to "tl" if "fil" is absent."
* commit '
39e4f590787246ce35b995c0c0ce37b676a05e0c':
Fall back to "tl" if "fil" is absent.
Narayan Kamath [Wed, 2 Jul 2014 10:00:09 +0000 (10:00 +0000)]
am
f56399f6: Merge "Fall back to "tl" if "fil" is absent."
* commit '
f56399f6ab492c8c32b7ff9a8deeb2547f17f6da':
Fall back to "tl" if "fil" is absent.
Narayan Kamath [Wed, 2 Jul 2014 09:54:22 +0000 (09:54 +0000)]
am
94171212: am
104da1e4: Merge "Fix broken assumptions in LocalePicker."
* commit '
94171212431a45346e40fd97bbe72422e71f04be':
Fix broken assumptions in LocalePicker.
Narayan Kamath [Wed, 2 Jul 2014 09:51:54 +0000 (09:51 +0000)]
am
d62196cf: am
3fa99ec7: Merge "Remove bogus 2 char limit for locales and countries."
* commit '
d62196cfeffe5e4d725b5388fca57a18c154a44b':
Remove bogus 2 char limit for locales and countries.
Narayan Kamath [Wed, 2 Jul 2014 08:49:08 +0000 (08:49 +0000)]
am
104da1e4: Merge "Fix broken assumptions in LocalePicker."
* commit '
104da1e495cbed81e7ebe66b80344bf916b02391':
Fix broken assumptions in LocalePicker.
Narayan Kamath [Wed, 2 Jul 2014 08:49:04 +0000 (08:49 +0000)]
am
3fa99ec7: Merge "Remove bogus 2 char limit for locales and countries."
* commit '
3fa99ec77ee52164575375c7709923c94d9693a6':
Remove bogus 2 char limit for locales and countries.
Robert Ly [Wed, 2 Jul 2014 00:22:10 +0000 (00:22 +0000)]
am
9b3bfb10: docs: updated expandedtext_combo
* commit '
9b3bfb1085770e558a31f9c4b1a6f9e6e34c8bc1':
docs: updated expandedtext_combo
Robert Ly [Wed, 2 Jul 2014 00:00:58 +0000 (17:00 -0700)]
docs: updated expandedtext_combo
Change-Id: Ida3f08560710bf9d32fefd6797830f2258fed3c6
Robert Ly [Wed, 2 Jul 2014 00:00:59 +0000 (00:00 +0000)]
am
f077e7b7: Merge "docs: add more notification images" into klp-modular-dev
* commit '
f077e7b719419271b5fd666c22b7d19177d6c325':
docs: add more notification images
Baligh Uddin [Wed, 2 Jul 2014 15:04:32 +0000 (15:04 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 2 Jul 2014 15:04:35 +0000 (15:04 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Wed, 2 Jul 2014 15:04:24 +0000 (15:04 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Brian Carlstrom [Tue, 1 Jul 2014 22:37:18 +0000 (22:37 +0000)]
am
8922ddba: am
a6e06889: Merge "Add profiler type options"
* commit '
8922ddbab1e394a59f957e8598fbbf88357e7838':
Add profiler type options
Brian Carlstrom [Tue, 1 Jul 2014 22:32:01 +0000 (22:32 +0000)]
am
a6e06889: Merge "Add profiler type options"
* commit '
a6e06889fce7fbf2049f421daef02b8986736f77':
Add profiler type options
Chris Craik [Tue, 1 Jul 2014 22:23:57 +0000 (15:23 -0700)]
Fix klp-modular-dev-plus-aosp build
Change-Id: I546dfef29b5875633de18f6a7e3f419a0d012faa
Nick Kralevich [Tue, 1 Jul 2014 21:16:14 +0000 (21:16 +0000)]
am
d172419e: am
9b1a7d45: Merge "Allow different SELinux policies for third party apps."
* commit '
d172419e9a36f61af8c98d316ec2625e1f1304f6':
Allow different SELinux policies for third party apps.
Nick Kralevich [Tue, 1 Jul 2014 21:13:12 +0000 (21:13 +0000)]
am
9b1a7d45: Merge "Allow different SELinux policies for third party apps."
* commit '
9b1a7d4570dd692cf86c385dfcdf057ad966fa57':
Allow different SELinux policies for third party apps.
Nick Kralevich [Tue, 1 Jul 2014 21:09:28 +0000 (21:09 +0000)]
Merge "Allow different SELinux policies for third party apps."
Robert Craig [Tue, 1 Jul 2014 20:53:11 +0000 (13:53 -0700)]
Allow different SELinux policies for third party apps.
Prior support forced all third party apps
to be resolved against the default stanza
of the mac_permissions.xml file when assigning
seinfo labels. This meant that all third party
apps, in effect, were untrusted regardless of
cert and therefore received the same selinux domain.
This also had the unfortunate side effect of forcing
certain third party apps into the wrong domains
because of shared userid requests among apps.
This patch removes that restriction and instead
allows all apps, regardless of location, to be
matched against the full mac_permissions.xml
policy file. This then allows all apps signed
with known good certs to receive the same selinux
domains of other apps with whom they share trust.
Change-Id: Iba569c046135c0e81140faf6296c5da26a243037
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
Baligh Uddin [Tue, 1 Jul 2014 18:22:35 +0000 (11:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I006181afb024c03d268793fe4a8f547d9ee82d6b
Auto-generated-cl: translation import
Marco Nelissen [Tue, 1 Jul 2014 18:21:41 +0000 (18:21 +0000)]
am
899c15ef: am
db816cef: Merge "Make sure we clean up"
* commit '
899c15ef2053f0cebfeda90b5211e80310e6f278':
Make sure we clean up
Baligh Uddin [Tue, 1 Jul 2014 18:15:32 +0000 (11:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I71e375bba32fd94ba872c7f5f35f338470a53524
Auto-generated-cl: translation import
Marco Nelissen [Tue, 1 Jul 2014 18:15:28 +0000 (18:15 +0000)]
am
db816cef: Merge "Make sure we clean up"
* commit '
db816cef0dd1f1988fbcf3c70a66f9c4acf73358':
Make sure we clean up
Baligh Uddin [Tue, 1 Jul 2014 18:14:47 +0000 (18:14 +0000)]
am
b9246ef5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
b9246ef52c7f8ea7c4888c0f45005a49792a8614':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 1 Jul 2014 18:14:40 +0000 (18:14 +0000)]
am
9846e4c6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
9846e4c676e9b1b656081bab3f9cb304f8cc3cdf':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 1 Jul 2014 18:14:36 +0000 (18:14 +0000)]
am
4a4fa0a3: (-s ours) Import translations. DO NOT MERGE
* commit '
4a4fa0a30a4d53816fcb56545054d624f3243cb6':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 1 Jul 2014 18:14:28 +0000 (11:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I827912aaef1d4a9bd0d38cdcbc24143d91704b56
Auto-generated-cl: translation import
Narayan Kamath [Wed, 2 Jul 2014 08:09:01 +0000 (08:09 +0000)]
Merge "Fix broken assumptions in LocalePicker."
Narayan Kamath [Wed, 2 Jul 2014 08:08:36 +0000 (08:08 +0000)]
Merge "Remove bogus 2 char limit for locales and countries."
Narayan Kamath [Wed, 2 Jul 2014 12:07:57 +0000 (12:07 +0000)]
Merge "Fix native crashes when APKs can't be opened."
Narayan Kamath [Wed, 2 Jul 2014 09:54:25 +0000 (09:54 +0000)]
Merge "Fall back to "tl" if "fil" is absent."
Narayan Kamath [Thu, 26 Jun 2014 15:01:28 +0000 (16:01 +0100)]
Fall back to "tl" if "fil" is absent.
For JB-MR1, there was a hack that used "tl" where
we really meant "fil" because ICU didn't have localizations
for "fil". This has now been fixed, and we now support 3 letter
language codes for AAPT so we can use "fil" where required.
For the benefit of apps that need to target older platforms,
we fall back to "tl" if the app has assets for "tl" and the
resource locale is "fil".
See bugs
7291355,
7207176 and
8049507 for more context.
Change-Id: I1ac8502525f99b40f9091d5efd2df33518d47a41
Baligh Uddin [Tue, 1 Jul 2014 17:47:53 +0000 (10:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1027a88bab0d00d223807bba87f9bbb75aef4d79
Auto-generated-cl: translation import
Marco Nelissen [Tue, 1 Jul 2014 18:10:37 +0000 (18:10 +0000)]
Merge "Make sure we clean up"
Brian Carlstrom [Tue, 1 Jul 2014 22:25:58 +0000 (22:25 +0000)]
Merge "Add profiler type options"
Baligh Uddin [Tue, 1 Jul 2014 18:06:27 +0000 (18:06 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Tue, 1 Jul 2014 17:45:41 +0000 (10:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7ad5171c74ba22fff8602cf99b6a87f93f0f86a0
Auto-generated-cl: translation import
Robert Ly [Tue, 1 Jul 2014 23:57:04 +0000 (23:57 +0000)]
Merge "docs: add more notification images" into klp-modular-dev
Robert Ly [Tue, 1 Jul 2014 23:52:56 +0000 (16:52 -0700)]
docs: add more notification images
Change-Id: Ia71ef7783c89da319a9179a4f1c4ab197df818c5
Baligh Uddin [Tue, 1 Jul 2014 18:06:29 +0000 (18:06 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Tue, 1 Jul 2014 17:44:30 +0000 (10:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8995e4e7008c4ec3c06e6ef65046d8fc9987c33a
Auto-generated-cl: translation import
Narayan Kamath [Tue, 1 Jul 2014 11:44:51 +0000 (12:44 +0100)]
Remove bogus 2 char limit for locales and countries.
Locale settings are persisted to system properties
and not to system settings, so the values read here
are used pretty much everywhere.
bug:
15873165
bug:
10090157
Change-Id: Ie7cda166439112c615afbd38253cf4fbb5791242
Narayan Kamath [Tue, 1 Jul 2014 10:23:44 +0000 (10:23 +0000)]
am
7f319c47: am
1dc550fa: Merge "Fix packing of values at offset 16."
* commit '
7f319c47c8f5e947638eb1e5e73789ff83123bba':
Fix packing of values at offset 16.
Narayan Kamath [Tue, 1 Jul 2014 09:56:20 +0000 (10:56 +0100)]
Fix broken assumptions in LocalePicker.
This code assumed that the locale is always 5 chars in
length and was of the form xx-YY. This is not necessarily
true. The language can be 3 letters in length and the locale
might have a script and variant.
Also cleans up several nasty pieces of code and eliminates
unnecessary array copies and improves readability by using
idiomatic java.
bug:
15873165
bug:
10090157
Change-Id: Iab1cfd7b78e5772b1245654f2153caf63a96033d
Narayan Kamath [Tue, 1 Jul 2014 09:22:10 +0000 (09:22 +0000)]
am
1dc550fa: Merge "Fix packing of values at offset 16."
* commit '
1dc550fa7333257a130d71866be37181f8ee553b':
Fix packing of values at offset 16.
Robert Ly [Tue, 1 Jul 2014 02:52:30 +0000 (02:52 +0000)]
am
7459dfed: Merge "docs: add new UX images for notifications and wear" into klp-modular-dev
* commit '
7459dfed6c4353a9437f5c5fbbbc1738f465a432':
docs: add new UX images for notifications and wear
Robert Ly [Tue, 1 Jul 2014 02:46:53 +0000 (02:46 +0000)]
Merge "docs: add new UX images for notifications and wear" into klp-modular-dev
Robert Ly [Tue, 1 Jul 2014 01:18:22 +0000 (18:18 -0700)]
docs: add new UX images for notifications and wear
Change-Id: I936209db7260c77aec425f3457497cd70a66b767
Quddus Chong [Mon, 30 Jun 2014 21:51:32 +0000 (21:51 +0000)]
am
5212ee08: Merge "docs: Add Javadocs for GMS Longhorn." into klp-modular-dev
* commit '
5212ee08f3061c07a6a323e9169b63b596c4c824':
docs: Add Javadocs for GMS Longhorn.
Quddus Chong [Mon, 30 Jun 2014 21:51:28 +0000 (21:51 +0000)]
am
85a25e02: Merge "docs: Added "What\'s New" for GMS Longhorn (Google Play Services 5.0)" into klp-modular-dev
* commit '
85a25e02004f77595e352e03c1fdb11b6126db69':
docs: Added "What's New" for GMS Longhorn (Google Play Services 5.0)
Tim Kilbourn [Mon, 30 Jun 2014 20:54:30 +0000 (20:54 +0000)]
am
326b1857: Merge "Fix docs" into klp-modular-dev
* commit '
326b1857a5ced49f249358751e05ce237bfaefc8':
Fix docs
Robert Ly [Mon, 30 Jun 2014 20:17:33 +0000 (20:17 +0000)]
am
e1e35d13: docs: fix notifications docs
* commit '
e1e35d13023224c22a54ce074c45d2f8729b1c60':
docs: fix notifications docs
Robert Ly [Mon, 30 Jun 2014 19:48:22 +0000 (12:48 -0700)]
docs: fix notifications docs
Change-Id: I14f55619ae0e0c53811c09410fec5ef8bf577ff6
Quddus Chong [Mon, 30 Jun 2014 21:46:59 +0000 (21:46 +0000)]
Merge "docs: Add Javadocs for GMS Longhorn." into klp-modular-dev
Brian Carlstrom [Mon, 30 Jun 2014 16:28:38 +0000 (09:28 -0700)]
Update preloaded-classes for ART DO NOT MERGE
Change-Id: If0b1bfa2fa1fc80351c11ff2936e1b204539aa64
Narayan Kamath [Thu, 12 Jun 2014 16:19:43 +0000 (17:19 +0100)]
Fix native crashes when APKs can't be opened.
There was lax / incomplete error checking around the
construction of Apk handles. This change changes the ApkHandle
API and makes it throw IOException if the zipfile couldn't
be opened.
Additionally :
- Fix a resource leak in DefaultContainerService
- Report errors correctly during package moves.
bug:
15563874
Change-Id: Ic71a10709eb82b8f53405bbfb2320e80aa96b771
Dirk Dougherty [Mon, 30 Jun 2014 01:06:15 +0000 (01:06 +0000)]
am
7ecb89fc: Merge "Change card title for admob." into klp-modular-dev
* commit '
7ecb89fc1e2b07e51dcc52fe6e778855dfb92c15':
Change card title for admob.
Dirk Dougherty [Mon, 30 Jun 2014 01:06:11 +0000 (01:06 +0000)]
am
14ec9ade: Merge "Doc change: API diff 20." into klp-modular-dev
* commit '
14ec9adefa1cad0c5444bc938f0edaebaf4d1eee':
Doc change: API diff 20.
Robert Ly [Mon, 30 Jun 2014 01:00:08 +0000 (01:00 +0000)]
Robert Ly [Mon, 30 Jun 2014 01:00:03 +0000 (01:00 +0000)]
am
63234bf7: Merge "Revert "add API reference docs filtering for level 20"" into klp-modular-dev
* commit '
63234bf7ab9a05f2e8fb858a31af270ca82b33ad':
Revert "add API reference docs filtering for level 20"
Robert Ly [Mon, 30 Jun 2014 00:55:24 +0000 (17:55 -0700)]
resolved conflicts for merge of
4d329a8f to klp-modular-dev-plus-aosp
Change-Id: Id8096712bc63fe16f93dca4a7963440e11087f7a
Robert Ly [Sun, 29 Jun 2014 23:53:54 +0000 (16:53 -0700)]
add api 20
DO NOT MERGE
Change-Id: Iae685158ac9c08e3a074e36d60004faf995fd1c7
Robert Ly [Sun, 29 Jun 2014 23:42:55 +0000 (23:42 +0000)]
am
6fff230d: Merge "docs : fix broken links" into klp-modular-dev
* commit '
6fff230d64b869ec9a3f3bb10ea5ae30b041a85a':
docs : fix broken links
Robert Ly [Sun, 29 Jun 2014 23:42:50 +0000 (23:42 +0000)]
am
50b55d61: docs: update notifications docs
* commit '
50b55d61af63098d0b95e38afdc5c381b3373cd6':
docs: update notifications docs
Robert Ly [Sun, 29 Jun 2014 20:00:11 +0000 (13:00 -0700)]
docs: update notifications docs
Change-Id: I0473c75c31c4012dbb3fc81d155da237f8f1f7fd
Scott Main [Sat, 28 Jun 2014 02:39:37 +0000 (02:39 +0000)]
am
7b5abd15: Merge "docs: fix L Preview G+ links (permanently)" into klp-modular-dev
* commit '
7b5abd15ab15c9f36783dd00c1953d9cf16c33f7':
docs: fix L Preview G+ links (permanently)
smain@google.com [Sat, 28 Jun 2014 02:32:24 +0000 (02:32 +0000)]
am
d2b869d0: revisions to the app structure design guide
* commit '
d2b869d052e65958545f2dc49c3eef8ff0066280':
revisions to the app structure design guide
Robert Ly [Sat, 28 Jun 2014 02:32:19 +0000 (02:32 +0000)]
am
4c42ab4b: (-s ours) Merge "Revert "Add api 20 to list used by reference docs."" into klp-modular-dev
* commit '
4c42ab4ba59d75eca4883ece2944c30ca36b760f':
Revert "Add api 20 to list used by reference docs."
Robert Ly [Sat, 28 Jun 2014 02:26:16 +0000 (02:26 +0000)]
am
e774eb93: (-s ours) Merge "Add api 20 to list used by reference docs." into klp-modular-dev
* commit '
e774eb939875c02135c7ce9af8e81322a7c0ab59':
Add api 20 to list used by reference docs.
smain@google.com [Sat, 28 Jun 2014 00:05:32 +0000 (17:05 -0700)]
revisions to the app structure design guide
Change-Id: I15e68e454180b848db81791350ba7985817c0930
smain@google.com [Fri, 27 Jun 2014 22:57:57 +0000 (22:57 +0000)]
am
67421351: Merge "fix links to wear downloads" into klp-modular-dev
* commit '
67421351cc6fd99aef741bb3bc2599bcb1288d1d':
fix links to wear downloads