OSDN Git Service
Adam Lesinski [Tue, 18 Feb 2014 22:57:37 +0000 (22:57 +0000)]
am
3d9bcb90: Create FEATURE_ constants for print and backup
* commit '
3d9bcb90ee6c0ffff93642539ae64fb672c7f14a':
Create FEATURE_ constants for print and backup
Adam Lesinski [Tue, 18 Feb 2014 22:05:14 +0000 (14:05 -0800)]
Create FEATURE_ constants for print and backup
Bug:
13079822
Change-Id: I6f4b759951d45989e8aad4011fae431ee2ecae0c
Jeff Sharkey [Tue, 18 Feb 2014 17:19:38 +0000 (17:19 +0000)]
am
660a514e: am
60097a9c: Merge "Structure device not freed in error case"
* commit '
660a514e80e0019d8c6632e84bd03491722fc2ab':
Structure device not freed in error case
Jeff Sharkey [Tue, 18 Feb 2014 17:16:31 +0000 (09:16 -0800)]
am
60097a9c: Merge "Structure device not freed in error case"
* commit '
60097a9c5a7214cb73d0bc966adef767743f8798':
Structure device not freed in error case
Jeff Sharkey [Tue, 18 Feb 2014 17:15:44 +0000 (17:15 +0000)]
am
df47ecaa: am
02a64dae: Merge "Tethering: Skip link local addresses when enabling NAT"
* commit '
df47ecaa0973b80c9b97ef9ed3ad7abcfef361c7':
Tethering: Skip link local addresses when enabling NAT
Jeff Sharkey [Tue, 18 Feb 2014 17:15:39 +0000 (17:15 +0000)]
am
e6d256c5: am
234b0b03: Merge "Fix, MountService now only sends one onShutDownComplete"
* commit '
e6d256c50b0709378a5bfff0ae27eb7cf6cc3894':
Fix, MountService now only sends one onShutDownComplete
Jeff Sharkey [Tue, 18 Feb 2014 17:13:00 +0000 (09:13 -0800)]
am
02a64dae: Merge "Tethering: Skip link local addresses when enabling NAT"
* commit '
02a64daefece8ccdc40935c7bc865a8966249c44':
Tethering: Skip link local addresses when enabling NAT
Jeff Sharkey [Tue, 18 Feb 2014 17:12:57 +0000 (09:12 -0800)]
am
234b0b03: Merge "Fix, MountService now only sends one onShutDownComplete"
* commit '
234b0b037ee1f8dc50c846279216a8e4d779ff56':
Fix, MountService now only sends one onShutDownComplete
Jeff Sharkey [Tue, 18 Feb 2014 17:12:14 +0000 (17:12 +0000)]
Merge "Structure device not freed in error case"
Jeff Sharkey [Tue, 18 Feb 2014 17:11:09 +0000 (17:11 +0000)]
Merge "Tethering: Skip link local addresses when enabling NAT"
Jeff Sharkey [Tue, 18 Feb 2014 17:10:02 +0000 (17:10 +0000)]
Merge "Fix, MountService now only sends one onShutDownComplete"
Narayan Kamath [Mon, 17 Feb 2014 18:27:13 +0000 (18:27 +0000)]
am
92a09fbd: am
a14d9c31: Merge "Move Json{Reader,Writer} test to cts."
* commit '
92a09fbdebae5362633db281bc155ed1f1145588':
Move Json{Reader,Writer} test to cts.
Narayan Kamath [Mon, 17 Feb 2014 18:23:56 +0000 (10:23 -0800)]
am
a14d9c31: Merge "Move Json{Reader,Writer} test to cts."
* commit '
a14d9c318a1d358902a76aff733303c5509bb5fc':
Move Json{Reader,Writer} test to cts.
Narayan Kamath [Mon, 17 Feb 2014 18:20:33 +0000 (18:20 +0000)]
Merge "Move Json{Reader,Writer} test to cts."
Narayan Kamath [Mon, 17 Feb 2014 17:51:43 +0000 (17:51 +0000)]
Move Json{Reader,Writer} test to cts.
These tests aren't really run automatically (or perhaps
even manually) in their present location, and increasing
CTS coverage is never a bad thing.
Change-Id: I81cce1211021011dca551fde62e725e177ca4df0
Narayan Kamath [Mon, 17 Feb 2014 11:06:38 +0000 (11:06 +0000)]
am
28879bbf: am
be57fca4: Merge "Extended locales in AAPT / AssetManager."
* commit '
28879bbfe89dc4bf2067a7183975ecffb82f68e6':
Extended locales in AAPT / AssetManager.
Narayan Kamath [Mon, 17 Feb 2014 11:06:31 +0000 (11:06 +0000)]
am
183e5e03: am
49024bac: Merge "AssetManager support for 3 letter lang/country codes."
* commit '
183e5e038bd844ac415b14f22df5c476732066c8':
AssetManager support for 3 letter lang/country codes.
Narayan Kamath [Mon, 17 Feb 2014 11:03:49 +0000 (03:03 -0800)]
am
be57fca4: Merge "Extended locales in AAPT / AssetManager."
* commit '
be57fca41a731217010d9f92554cf48708b06ecf':
Extended locales in AAPT / AssetManager.
Narayan Kamath [Mon, 17 Feb 2014 11:03:46 +0000 (03:03 -0800)]
am
49024bac: Merge "AssetManager support for 3 letter lang/country codes."
* commit '
49024bacf63db39467e7f318c682ad771ec0de22':
AssetManager support for 3 letter lang/country codes.
Narayan Kamath [Mon, 17 Feb 2014 11:00:29 +0000 (11:00 +0000)]
Merge "Extended locales in AAPT / AssetManager."
Narayan Kamath [Mon, 17 Feb 2014 11:00:14 +0000 (11:00 +0000)]
Merge "AssetManager support for 3 letter lang/country codes."
Tim Murray [Fri, 14 Feb 2014 23:56:57 +0000 (23:56 +0000)]
am
4870c813: am
7d1a6c5c: Merge "Fix destruction issues relating to AllocationAdapter."
* commit '
4870c813fe4a6fc7a176f22b5e7f96e9f7a4e469':
Fix destruction issues relating to AllocationAdapter.
Tim Murray [Fri, 14 Feb 2014 23:53:59 +0000 (15:53 -0800)]
am
7d1a6c5c: Merge "Fix destruction issues relating to AllocationAdapter."
* commit '
7d1a6c5cac16795e5953d2b4d34671e34e907632':
Fix destruction issues relating to AllocationAdapter.
Tim Murray [Fri, 14 Feb 2014 23:50:08 +0000 (23:50 +0000)]
Merge "Fix destruction issues relating to AllocationAdapter."
Tim Murray [Wed, 12 Feb 2014 19:16:17 +0000 (11:16 -0800)]
Fix destruction issues relating to AllocationAdapter.
bug
12971201
Change-Id: I3d9f66f527a35837ac866a695bdcc41d908a2562
Ben Gruver [Fri, 14 Feb 2014 23:08:10 +0000 (23:08 +0000)]
am
da379447: am
509a243c: Merge "Check the return value of listFiles on the ifw directory"
* commit '
da37944785c47b2b92c1a0f79c5d602256859fe6':
Check the return value of listFiles on the ifw directory
Tim Murray [Fri, 14 Feb 2014 23:08:01 +0000 (23:08 +0000)]
am
b25a6936: am
d7043f00: Merge "Add hidden minor version ID for support lib workarounds."
* commit '
b25a6936a1b0dbabaf8ad8c2ce59e7251daa9e8c':
Add hidden minor version ID for support lib workarounds.
Ben Gruver [Fri, 14 Feb 2014 21:57:24 +0000 (13:57 -0800)]
am
509a243c: Merge "Check the return value of listFiles on the ifw directory"
* commit '
509a243c2c5ebc9cc55324bd9a03a5b560d81cfb':
Check the return value of listFiles on the ifw directory
Ben Gruver [Fri, 14 Feb 2014 21:15:49 +0000 (21:15 +0000)]
Merge "Check the return value of listFiles on the ifw directory"
Ben Gruver [Tue, 1 Oct 2013 00:03:34 +0000 (17:03 -0700)]
Check the return value of listFiles on the ifw directory
listFiles can return null if the directory doesn't exist
Bug:
10497143
Change-Id: Ie4cbdf18a259a9641669a4e6b9bf49b4879acc67
Tim Murray [Fri, 14 Feb 2014 20:51:32 +0000 (12:51 -0800)]
am
d7043f00: Merge "Add hidden minor version ID for support lib workarounds."
* commit '
d7043f0084237200b6aab5d101c8ab6d3ab495c6':
Add hidden minor version ID for support lib workarounds.
Tim Murray [Fri, 14 Feb 2014 20:47:33 +0000 (20:47 +0000)]
Merge "Add hidden minor version ID for support lib workarounds."
Narayan Kamath [Tue, 21 Jan 2014 15:32:36 +0000 (15:32 +0000)]
Extended locales in AAPT / AssetManager.
Support 3 letter language codes, script codes &
variants. The bulk of the changes are related to
the implementation of command line filtering of
locales etc. The previous code assumed that the
value of each "axis" (locale, density, size etc.)
could be represented by a 4 byte type. This is
no longer the case.
This change introduces a new class, AaptLocaleValue
which holds a (normalized) locale parsed from a
directory name or a filter string. This class takes
responsibility for parsing locales as well as
writing them to ResTable_config structures, which is
their representation in the resource table.
This includes minor changes at the java / JNI level
for AssetManager. We now call locale.toLanguageTag()
to give the native layer a well formed BCP-47 tag.
I've removed some duplicated parsing code in
AssetManager.cpp and replaced them with functions on
ResTable_config. The native getLocales function has
been changed to return well formed BCP-47 locales as
well, so that the corresponding java function can use
Locale.forLanguageTag to construct a Locale object
out of it.
Finally, this change introduces default and copy
constructors for ResTable_config to prevent having
to memset() the associated memory to 0 on every
stack allocation.
(cherry-picked from commit
91447d88f2bdf9c2bf8d1a53570efef6172fba74)
Change-Id: I1b43086860661012f949fb8e5deb7df44519b854
Narayan Kamath [Mon, 20 Jan 2014 13:57:11 +0000 (13:57 +0000)]
AssetManager support for 3 letter lang/country codes.
- 3 letter codes are packed into the existing 32 bit locale
field in ResTable_config
- We introduce new fields for script / variant information.
Note that we define a "match" between two ResTable_config
structures to be purely on the basis of their language &
country (disregarding the script and the variant). However,
configs with scripts and variants are considered to be more
specific than those without.
(cherry picked from commit
378c6775a62d9c461cde51f06c1b14bb014c78fd)
Change-Id: I7dce82a3fe2412834252723f458826ae41535a78
Narayan Kamath [Fri, 14 Feb 2014 13:17:13 +0000 (13:17 +0000)]
am
3bec0fbb: am
fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSession class"
* commit '
3bec0fbb349a969934828ee726956877a3a21dee':
AArch64: Use long for pointers in SurfaceSession class
Narayan Kamath [Fri, 14 Feb 2014 13:14:07 +0000 (05:14 -0800)]
am
fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSession class"
* commit '
fa8f95e9b96e3a12e98269c8a31ed34df6a323ca':
AArch64: Use long for pointers in SurfaceSession class
Narayan Kamath [Fri, 14 Feb 2014 13:10:43 +0000 (13:10 +0000)]
Merge "AArch64: Use long for pointers in SurfaceSession class"
Jeff Brown [Fri, 14 Feb 2014 09:14:15 +0000 (09:14 +0000)]
am
3048191b: Remove onCreate() method that should not be there.
* commit '
3048191b4cf9eff7a72b84065dec2b3dd1e89b3c':
Remove onCreate() method that should not be there.
Jeff Brown [Fri, 14 Feb 2014 09:14:09 +0000 (09:14 +0000)]
am
567f7ca4: Refactor dream manager to new pattern.
* commit '
567f7ca424280ae957b04d4f3df690055f2d41df':
Refactor dream manager to new pattern.
Jeff Brown [Fri, 14 Feb 2014 07:02:05 +0000 (23:02 -0800)]
Remove onCreate() method that should not be there.
Change-Id: I8355dd78f910afa9895d2fa00cb627a0885d9eec
Jeff Brown [Fri, 31 Jan 2014 07:38:03 +0000 (23:38 -0800)]
Refactor dream manager to new pattern.
Change-Id: I99ab4bd98d56a290368dc4b24e5bb24e0656b522
Dianne Hackborn [Fri, 14 Feb 2014 01:54:49 +0000 (01:54 +0000)]
am
01de2432: am
24d8fa73: Merge "frameworks/base: move idmap from frameworks/native"
* commit '
01de243263d347f2ac13a239d67d41817e34df33':
frameworks/base: move idmap from frameworks/native
Wink Saville [Fri, 14 Feb 2014 01:54:43 +0000 (01:54 +0000)]
am
ea56c795: am
bbba8211: Merge "Telephony: Handle DATA_CALL_LIST in DCC."
* commit '
ea56c795b0b4997f5835ec42a18eccdb173bc468':
Telephony: Handle DATA_CALL_LIST in DCC.
Dianne Hackborn [Fri, 14 Feb 2014 01:50:53 +0000 (17:50 -0800)]
am
24d8fa73: Merge "frameworks/base: move idmap from frameworks/native"
* commit '
24d8fa739b7ca0791174af260ed95cdc139e0903':
frameworks/base: move idmap from frameworks/native
Wink Saville [Fri, 14 Feb 2014 01:50:51 +0000 (17:50 -0800)]
am
bbba8211: Merge "Telephony: Handle DATA_CALL_LIST in DCC."
* commit '
bbba8211f9eca938d5d482583fd6e047615b4334':
Telephony: Handle DATA_CALL_LIST in DCC.
Dianne Hackborn [Fri, 14 Feb 2014 01:45:12 +0000 (01:45 +0000)]
Merge "frameworks/base: move idmap from frameworks/native"
Wink Saville [Thu, 13 Feb 2014 23:37:03 +0000 (23:37 +0000)]
Merge "Telephony: Handle DATA_CALL_LIST in DCC."
Craig Mautner [Thu, 13 Feb 2014 19:18:04 +0000 (19:18 +0000)]
am
474f1fbe: Merge "Don\'t null class member before using it." into klp-modular-dev
* commit '
474f1fbe8d87563909c3cb69ec921d427cd1f0b0':
Don't null class member before using it.
Craig Mautner [Thu, 13 Feb 2014 19:14:17 +0000 (19:14 +0000)]
Merge "Don't null class member before using it." into klp-modular-dev
Craig Mautner [Thu, 13 Feb 2014 19:12:42 +0000 (11:12 -0800)]
Don't null class member before using it.
Changing the order of detachStack() and usage of mDisplayContent
fixes NPE.
Fixes bug
12823709.
Change-Id: I04760b1d6fd5d3ffc49b99ca4acb47bf7e61cb46
Craig Mautner [Thu, 13 Feb 2014 19:05:18 +0000 (19:05 +0000)]
am
0af894d2: Merge "Update DimLayer sizes on rotation." into klp-modular-dev
* commit '
0af894d25133890e7765e6c582b3ac4829070de8':
Update DimLayer sizes on rotation.
Craig Mautner [Thu, 13 Feb 2014 19:02:01 +0000 (19:02 +0000)]
Merge "Update DimLayer sizes on rotation." into klp-modular-dev
Craig Mautner [Thu, 13 Feb 2014 18:59:16 +0000 (10:59 -0800)]
Update DimLayer sizes on rotation.
Required replumbing and updating the TaskStack bounds calculations
to match the new separation of TaskStack from DisplayContent.
Fixes bug
12780687.
Change-Id: I061c92831c06f4eb3e673ad6296e721b0c0f3202
Wink Saville [Thu, 13 Feb 2014 08:44:55 +0000 (08:44 +0000)]
am
16c0b295: am
bba3a694: Merge "Telephony API extension v2"
* commit '
16c0b295ef069e128a4e01fd2f72da06784950a1':
Telephony API extension v2
Wink Saville [Thu, 13 Feb 2014 04:29:01 +0000 (20:29 -0800)]
am
bba3a694: Merge "Telephony API extension v2"
* commit '
bba3a694b8400fd340c0400bf42ef3d79a4285b1':
Telephony API extension v2
Wink Saville [Thu, 13 Feb 2014 04:26:33 +0000 (04:26 +0000)]
Merge "Telephony API extension v2"
Dirk Dougherty [Thu, 13 Feb 2014 03:53:48 +0000 (03:53 +0000)]
am
820bb4bd: am
9c50271d: am
257f6724: am
35cb4e49: Doc change: add new samples TOC groups and landing pages.
* commit '
820bb4bdd358bfaac446b8ce4af5474dcfc77613':
Doc change: add new samples TOC groups and landing pages.
Dirk Dougherty [Thu, 13 Feb 2014 03:50:08 +0000 (03:50 +0000)]
am
9c50271d: am
257f6724: am
35cb4e49: Doc change: add new samples TOC groups and landing pages.
* commit '
9c50271dc34e48d527db7da85c3b3474574faee2':
Doc change: add new samples TOC groups and landing pages.
Dirk Dougherty [Thu, 13 Feb 2014 03:47:02 +0000 (03:47 +0000)]
am
257f6724: am
35cb4e49: Doc change: add new samples TOC groups and landing pages.
* commit '
257f67249afb017c9a3d0a79e545da567aa5bd02':
Doc change: add new samples TOC groups and landing pages.
Dirk Dougherty [Thu, 13 Feb 2014 03:44:38 +0000 (03:44 +0000)]
am
35cb4e49: Doc change: add new samples TOC groups and landing pages.
* commit '
35cb4e49365a8a8da0607c2659399aaad9ea5a1c':
Doc change: add new samples TOC groups and landing pages.
Dirk Dougherty [Sat, 8 Feb 2014 05:05:43 +0000 (21:05 -0800)]
Doc change: add new samples TOC groups and landing pages.
Change-Id: I2f39e82fb79d4f19362d9fe2deafdde5d87873a7
Craig Mautner [Wed, 12 Feb 2014 23:48:15 +0000 (23:48 +0000)]
am
4b79f838: Merge "Add debug for
12987986." into klp-modular-dev
* commit '
4b79f8380c47b0da89348e1115ea70e7898997ca':
Add debug for
12987986.
Craig Mautner [Wed, 12 Feb 2014 23:44:55 +0000 (23:44 +0000)]
Merge "Add debug for
12987986." into klp-modular-dev
Dirk Dougherty [Wed, 12 Feb 2014 23:43:56 +0000 (23:43 +0000)]
am
35ad8886: am
acec746b: am
55362018: am
271c8f12: Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs
* commit '
35ad8886f230d4bde4ea4cb2df9f07cf213c7cd1':
Doc change: minor edits to support easier extraction of document summaries.
Craig Mautner [Wed, 12 Feb 2014 23:43:40 +0000 (15:43 -0800)]
Add debug for
12987986.
For bug
12987986.
Change-Id: Idc122ba369ad7566e3fee290955bf91b0f610ae1
Dirk Dougherty [Wed, 12 Feb 2014 23:37:57 +0000 (23:37 +0000)]
am
acec746b: am
55362018: am
271c8f12: Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs
* commit '
acec746b8963410d4a9324df46272ac91f846868':
Doc change: minor edits to support easier extraction of document summaries.
Dirk Dougherty [Wed, 12 Feb 2014 23:34:35 +0000 (23:34 +0000)]
am
55362018: am
271c8f12: Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs
* commit '
55362018c9dfadff5eb1a138a1d90187110c253e':
Doc change: minor edits to support easier extraction of document summaries.
Joe Fernandez [Wed, 12 Feb 2014 23:33:43 +0000 (23:33 +0000)]
am
e5dc0c39: am
5b97ec6f: am
3885b00a: am
f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
* commit '
e5dc0c39912d6e1392e1a3324ad210e65c0105c8':
MediaRouter Developer Guide
Dirk Dougherty [Wed, 12 Feb 2014 23:30:19 +0000 (23:30 +0000)]
am
271c8f12: Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs
* commit '
271c8f12c88e87563ed17f4ad29610037bd300be':
Doc change: minor edits to support easier extraction of document summaries.
Joe Fernandez [Wed, 12 Feb 2014 23:29:38 +0000 (23:29 +0000)]
am
5b97ec6f: am
3885b00a: am
f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
* commit '
5b97ec6fa0e166113aad2abc1107e6bd3771cc2a':
MediaRouter Developer Guide
Dirk Dougherty [Wed, 12 Feb 2014 23:20:40 +0000 (23:20 +0000)]
Merge "Doc change: minor edits to support easier extraction of document summaries." into klp-docs
Joe Fernandez [Wed, 12 Feb 2014 23:19:10 +0000 (23:19 +0000)]
am
3885b00a: am
f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
* commit '
3885b00ae12df9f56e922ceda12326e922be1414':
MediaRouter Developer Guide
Nick Kralevich [Wed, 12 Feb 2014 23:19:05 +0000 (23:19 +0000)]
am
93994e9d: am
a9bb594d: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
* commit '
93994e9db44a30402bd596764163d81ee1b1fd30':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
Joe Fernandez [Wed, 12 Feb 2014 23:15:50 +0000 (23:15 +0000)]
am
f25bc75f: Merge "MediaRouter Developer Guide" into klp-docs
* commit '
f25bc75f591fbb04733b9cc33fabee2293973b8c':
MediaRouter Developer Guide
Joe Fernandez [Wed, 12 Feb 2014 23:13:01 +0000 (23:13 +0000)]
Merge "MediaRouter Developer Guide" into klp-docs
Nick Kralevich [Wed, 12 Feb 2014 23:12:08 +0000 (15:12 -0800)]
am
a9bb594d: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
* commit '
a9bb594da6aff97ba927ba67a34486d0b9c1b4a0':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
Dave Platt [Wed, 12 Feb 2014 23:10:36 +0000 (23:10 +0000)]
am
53c7608a: am
a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem"
* commit '
53c7608aefb0ed754394e571cac02e96ad6fcdb3':
Finish fixing Zygote descriptor leakage problem
Nick Kralevich [Wed, 12 Feb 2014 23:09:37 +0000 (23:09 +0000)]
Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
Dave Platt [Wed, 12 Feb 2014 23:07:07 +0000 (15:07 -0800)]
am
a3c3533b: Merge "Finish fixing Zygote descriptor leakage problem"
* commit '
a3c3533b1d6a4016cd1856fccac6cc404997b8a6':
Finish fixing Zygote descriptor leakage problem
Dave Platt [Wed, 12 Feb 2014 23:03:48 +0000 (23:03 +0000)]
Merge "Finish fixing Zygote descriptor leakage problem"
Joe Fernandez [Wed, 29 Jan 2014 00:17:44 +0000 (16:17 -0800)]
MediaRouter Developer Guide
staging: http://joefernandez2.mtv.corp.google.com:8210/guide/topics/media/mediarouter.html
Change-Id: I764828066de8b233e61ad8a5d4a102a4d231fa82
Ricardo Cervera [Wed, 12 Feb 2014 22:08:33 +0000 (22:08 +0000)]
am
3cb62db2: am
640e0c89: am
36547014: am
670944aa: Merge "docs: Added missing elements in uses-feature. Bug:
12913153" into klp-docs
* commit '
3cb62db29583d277ba630ee1644617fff5b615e5':
docs: Added missing elements in uses-feature. Bug:
12913153
Ricardo Cervera [Wed, 12 Feb 2014 22:08:30 +0000 (22:08 +0000)]
am
7d3344fd: am
58305f88: am
bff7db19: am
521a54d0: Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs
* commit '
7d3344fd9c71fc3c7202250a6b4752d30da3295d':
docs: Added notes for Build Tools Revision 19.0.2
Ricardo Cervera [Wed, 12 Feb 2014 22:08:27 +0000 (22:08 +0000)]
am
6960ad58: am
ac74a524: am
566e4df8: am
ca8757bf: Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs
* commit '
6960ad58ac989ce6ab2b5d34159ceeb1093b0e39':
docs: Added Revision 3 of Google APIs System Image.
Ricardo Cervera [Wed, 12 Feb 2014 22:02:53 +0000 (22:02 +0000)]
am
640e0c89: am
36547014: am
670944aa: Merge "docs: Added missing elements in uses-feature. Bug:
12913153" into klp-docs
* commit '
640e0c89c3fb4ee4f180b7a2d8b9aaad237f2f9c':
docs: Added missing elements in uses-feature. Bug:
12913153
Ricardo Cervera [Wed, 12 Feb 2014 22:02:49 +0000 (22:02 +0000)]
am
58305f88: am
bff7db19: am
521a54d0: Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs
* commit '
58305f88fdf111f960869340d54f46387fcab4bf':
docs: Added notes for Build Tools Revision 19.0.2
Ricardo Cervera [Wed, 12 Feb 2014 22:02:43 +0000 (22:02 +0000)]
am
ac74a524: am
566e4df8: am
ca8757bf: Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs
* commit '
ac74a5245bf115c4b5e23a3db515c0c3b5166662':
docs: Added Revision 3 of Google APIs System Image.
Ricardo Cervera [Wed, 12 Feb 2014 21:59:39 +0000 (21:59 +0000)]
am
36547014: am
670944aa: Merge "docs: Added missing elements in uses-feature. Bug:
12913153" into klp-docs
* commit '
36547014a3fa62e966739e12ccd31634b17058e9':
docs: Added missing elements in uses-feature. Bug:
12913153
Ricardo Cervera [Wed, 12 Feb 2014 21:59:36 +0000 (21:59 +0000)]
am
bff7db19: am
521a54d0: Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs
* commit '
bff7db19e3bbd2997490beec671b52e4e925c0a5':
docs: Added notes for Build Tools Revision 19.0.2
Ricardo Cervera [Wed, 12 Feb 2014 21:59:33 +0000 (21:59 +0000)]
am
566e4df8: am
ca8757bf: Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs
* commit '
566e4df8c3ff66fae6c343524272d332510e26f4':
docs: Added Revision 3 of Google APIs System Image.
Ricardo Cervera [Wed, 12 Feb 2014 21:56:29 +0000 (21:56 +0000)]
am
670944aa: Merge "docs: Added missing elements in uses-feature. Bug:
12913153" into klp-docs
* commit '
670944aa7272e95ba3ec02b83b2ae4f38ad577ba':
docs: Added missing elements in uses-feature. Bug:
12913153
Ricardo Cervera [Wed, 12 Feb 2014 21:56:27 +0000 (21:56 +0000)]
am
521a54d0: Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs
* commit '
521a54d0cc5288c4467652f4d773f372eebe970b':
docs: Added notes for Build Tools Revision 19.0.2
Ricardo Cervera [Wed, 12 Feb 2014 21:56:24 +0000 (21:56 +0000)]
am
ca8757bf: Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs
* commit '
ca8757bfc5fd506c647ccd1452c53c6ca4fafb81':
docs: Added Revision 3 of Google APIs System Image.
Dirk Dougherty [Sun, 9 Feb 2014 04:29:06 +0000 (20:29 -0800)]
Doc change: minor edits to support easier extraction of document summaries.
Change-Id: I1a15a1d233464d6c8d35a741c54932412dea28ee
Ricardo Cervera [Wed, 12 Feb 2014 21:05:31 +0000 (21:05 +0000)]
Merge "docs: Added missing elements in uses-feature. Bug:
12913153" into klp-docs
Ricardo Cervera [Wed, 12 Feb 2014 21:04:40 +0000 (21:04 +0000)]
Merge "docs: Added notes for Build Tools Revision 19.0.2" into klp-docs
Ricardo Cervera [Wed, 12 Feb 2014 21:04:00 +0000 (21:04 +0000)]
Merge "docs: Added Revision 3 of Google APIs System Image." into klp-docs
Craig Mautner [Wed, 12 Feb 2014 21:01:47 +0000 (21:01 +0000)]
am
731c30c1: Merge "Don\'t add windows from exiting app tokens twice." into klp-modular-dev
* commit '
731c30c17dac51e2279f8f789a647c61bd55028b':
Don't add windows from exiting app tokens twice.
Ricardo Cervera [Fri, 31 Jan 2014 00:12:51 +0000 (16:12 -0800)]
docs: Added Revision 3 of Google APIs System Image.
Updated Google Play services version to 4.2.42 too.
Change-Id: I1887414760e91808ed0a2574c24dab3598797f32
Review: http://quixote.mtv.corp.google.com:8003/tools/revisions/platforms.html
Craig Mautner [Wed, 12 Feb 2014 20:56:36 +0000 (20:56 +0000)]
Merge "Don't add windows from exiting app tokens twice." into klp-modular-dev
OSDN Git Service
