OSDN Git Service
Narayan Kamath [Thu, 16 Jan 2014 15:35:06 +0000 (07:35 -0800)]
am
8796ab7f: am
bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68
* commit '
8796ab7f22d3e9f5b85571e8851851c023416f96':
AArch64: Use long for pointers in BitmapRegionDecoder
AArch64: Use long for pointers in Movie class
AArch64: Add AssetInputStream.getNativeAsset
Narayan Kamath [Thu, 16 Jan 2014 15:35:02 +0000 (07:35 -0800)]
am
947d88a0: am
138d67c8: Merge "AArch64: Use long for pointers in MotionEvent class"
* commit '
947d88a0eacafb2e5ec5ce5eaaae8be32ecb9aa9':
AArch64: Use long for pointers in MotionEvent class
Narayan Kamath [Thu, 16 Jan 2014 15:34:57 +0000 (07:34 -0800)]
am
a0b25d41: am
d85bba8e: Merge "AArch64: Use long for pointers in VelocityTracker class"
* commit '
a0b25d41d556d2c37852b6036aaf6f33b0e8c5a8':
AArch64: Use long for pointers in VelocityTracker class
Narayan Kamath [Thu, 16 Jan 2014 15:34:53 +0000 (07:34 -0800)]
am
80b3dd0d: am
27a647bf: Merge "AArch64: Use long for pointers in android/os/MemoryFile"
* commit '
80b3dd0d8e333905e9f2a3a844bc524d41df7da2':
AArch64: Use long for pointers in android/os/MemoryFile
Narayan Kamath [Thu, 16 Jan 2014 15:34:48 +0000 (07:34 -0800)]
am
53321d99: am
f19c50d6: Merge "AArch64: Use long for pointers in KeyCharacterMap class"
* commit '
53321d9990cae810da28b7ae9f6f9b3fe7455020':
AArch64: Use long for pointers in KeyCharacterMap class
Narayan Kamath [Thu, 16 Jan 2014 15:34:43 +0000 (07:34 -0800)]
am
bc0468e6: am
6f17adba: Merge "AArch64: Use long for pointers in media classes"
* commit '
bc0468e67626937300e9afd182656469463d96a1':
AArch64: Use long for pointers in media classes
Elliott Hughes [Thu, 16 Jan 2014 15:34:39 +0000 (07:34 -0800)]
am
12377887: am
991e9818: Merge "AArch64: Use long for pointers in speech/srec classes"
* commit '
12377887e3a74a69100071e0a383f6d9a54046c9':
AArch64: Use long for pointers in speech/srec classes
Narayan Kamath [Thu, 16 Jan 2014 15:31:53 +0000 (07:31 -0800)]
am
bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68
* commit '
bb35356dc05632664e1d65588c9d0570c185280b':
AArch64: Use long for pointers in BitmapRegionDecoder
AArch64: Use long for pointers in Movie class
AArch64: Add AssetInputStream.getNativeAsset
Narayan Kamath [Thu, 16 Jan 2014 15:31:50 +0000 (07:31 -0800)]
am
138d67c8: Merge "AArch64: Use long for pointers in MotionEvent class"
* commit '
138d67c8476a846030be74ced1b1990d497402e0':
AArch64: Use long for pointers in MotionEvent class
Narayan Kamath [Thu, 16 Jan 2014 15:31:48 +0000 (07:31 -0800)]
am
d85bba8e: Merge "AArch64: Use long for pointers in VelocityTracker class"
* commit '
d85bba8ebd24257cb52867b6a082350746e97ad2':
AArch64: Use long for pointers in VelocityTracker class
Narayan Kamath [Thu, 16 Jan 2014 15:31:45 +0000 (07:31 -0800)]
am
27a647bf: Merge "AArch64: Use long for pointers in android/os/MemoryFile"
* commit '
27a647bf382f12aea6d0c9584302423e1c44fbb0':
AArch64: Use long for pointers in android/os/MemoryFile
Narayan Kamath [Thu, 16 Jan 2014 15:31:42 +0000 (07:31 -0800)]
am
f19c50d6: Merge "AArch64: Use long for pointers in KeyCharacterMap class"
* commit '
f19c50d6577b09ddabb5fa8c166b56c35ce2a66d':
AArch64: Use long for pointers in KeyCharacterMap class
Narayan Kamath [Thu, 16 Jan 2014 15:31:39 +0000 (07:31 -0800)]
am
6f17adba: Merge "AArch64: Use long for pointers in media classes"
* commit '
6f17adbabc329db1671c2fa6fd9e25cbf6a3fa8e':
AArch64: Use long for pointers in media classes
Elliott Hughes [Thu, 16 Jan 2014 15:31:36 +0000 (07:31 -0800)]
am
991e9818: Merge "AArch64: Use long for pointers in speech/srec classes"
* commit '
991e9818c69443fac927970c4c3521adaf687a44':
AArch64: Use long for pointers in speech/srec classes
Ricardo Cervera [Thu, 16 Jan 2014 15:25:04 +0000 (07:25 -0800)]
am
294d5f79: am
1d2a4e7b: Merge "docs: Fixed typos in audio-focus.jd. Bug:
12528498 HTML: quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html" into klp-docs
* commit '
294d5f790a564ac5f21d3dcfd1054abe544505a5':
docs: Fixed typos in audio-focus.jd. Bug:
12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html
Ricardo Cervera [Thu, 16 Jan 2014 15:19:30 +0000 (15:19 +0000)]
am
1d2a4e7b: Merge "docs: Fixed typos in audio-focus.jd. Bug:
12528498 HTML: quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html" into klp-docs
* commit '
1d2a4e7b9fddf57e2d8e562ad691653332ea0a4c':
docs: Fixed typos in audio-focus.jd. Bug:
12528498 HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html
Narayan Kamath [Thu, 16 Jan 2014 12:11:58 +0000 (12:11 +0000)]
Merge changes Id54087dd,I946325e4,I2a2b2e68
* changes:
AArch64: Use long for pointers in BitmapRegionDecoder
AArch64: Use long for pointers in Movie class
AArch64: Add AssetInputStream.getNativeAsset
Narayan Kamath [Thu, 16 Jan 2014 12:11:53 +0000 (12:11 +0000)]
Merge "AArch64: Use long for pointers in MotionEvent class"
Narayan Kamath [Thu, 16 Jan 2014 12:11:50 +0000 (12:11 +0000)]
Merge "AArch64: Use long for pointers in VelocityTracker class"
Narayan Kamath [Thu, 16 Jan 2014 12:11:45 +0000 (12:11 +0000)]
Merge "AArch64: Use long for pointers in android/os/MemoryFile"
Narayan Kamath [Thu, 16 Jan 2014 12:11:42 +0000 (12:11 +0000)]
Merge "AArch64: Use long for pointers in KeyCharacterMap class"
Narayan Kamath [Thu, 16 Jan 2014 12:11:37 +0000 (12:11 +0000)]
Merge "AArch64: Use long for pointers in media classes"
Elliott Hughes [Thu, 16 Jan 2014 01:38:51 +0000 (01:38 +0000)]
Merge "AArch64: Use long for pointers in speech/srec classes"
Ashok Bhat [Mon, 6 Jan 2014 11:35:32 +0000 (11:35 +0000)]
AArch64: Use long for pointers in speech/srec classes
For storing pointers, long is used in speech/srec classes,
as native pointers can be 64-bit.
Note corresponding JNI files are in the external/srec project
under srec_jni directory.
Change-Id: Iacd10840e81f5acc3eb202424f83b49ae4eb23ab
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Ricardo Cervera [Thu, 16 Jan 2014 01:26:13 +0000 (01:26 +0000)]
Merge "docs: Fixed typos in audio-focus.jd. Bug:
12528498 HTML: quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html" into klp-docs
quddusc [Thu, 16 Jan 2014 00:38:46 +0000 (16:38 -0800)]
am
2f1c2e32: am
3126ce6e: Merge "docs: Fixed typo in InstrumentationTestRunner page. Bug:
11386360" into klp-docs
* commit '
2f1c2e32301018f800e0200c2d7ec01f990e0050':
docs: Fixed typo in InstrumentationTestRunner page. Bug:
11386360
quddusc [Thu, 16 Jan 2014 00:36:27 +0000 (00:36 +0000)]
am
3126ce6e: Merge "docs: Fixed typo in InstrumentationTestRunner page. Bug:
11386360" into klp-docs
* commit '
3126ce6e096bebf4e21aea73d2bb872dcedb0d16':
docs: Fixed typo in InstrumentationTestRunner page. Bug:
11386360
quddusc [Thu, 16 Jan 2014 00:32:21 +0000 (00:32 +0000)]
Merge "docs: Fixed typo in InstrumentationTestRunner page. Bug:
11386360" into klp-docs
Ricardo Cervera [Thu, 16 Jan 2014 00:24:18 +0000 (16:24 -0800)]
am
96f6ce38: am
291fb4b5: Merge "docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug:
11371890 HTML: quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html" into klp-docs
* commit '
96f6ce38e383c0a2d416678bdfce41426e3f6b45':
docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug:
11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html
Ricardo Cervera [Thu, 16 Jan 2014 00:20:55 +0000 (00:20 +0000)]
am
291fb4b5: Merge "docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug:
11371890 HTML: quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html" into klp-docs
* commit '
291fb4b5ff8337d28ff8aa133cc2ea4a8fc09b58':
docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug:
11371890 HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html
Ricardo Cervera [Thu, 16 Jan 2014 00:19:07 +0000 (00:19 +0000)]
Merge "docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug:
11371890 HTML: quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html" into klp-docs
Dirk Dougherty [Thu, 16 Jan 2014 00:14:13 +0000 (16:14 -0800)]
am
d7a50a62: am
57801123: Merge "Doc change: add Drive API feature page. fix link text on several pages" into klp-docs
* commit '
d7a50a6282ac8540bcd9924d50c7ad27982a3dc9':
Doc change: add Drive API feature page. fix link text on several pages
Dirk Dougherty [Thu, 16 Jan 2014 00:14:07 +0000 (16:14 -0800)]
am
5f26f2c9: am
6ec44a88: Merge "Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore." into klp-docs
* commit '
5f26f2c9d2ae49a3f20bfaa1c73b93ea61881209':
Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore.
Dirk Dougherty [Thu, 16 Jan 2014 00:10:38 +0000 (00:10 +0000)]
am
57801123: Merge "Doc change: add Drive API feature page. fix link text on several pages" into klp-docs
* commit '
57801123c16a160d03dd265ca2f193b51e876186':
Doc change: add Drive API feature page. fix link text on several pages
Dirk Dougherty [Thu, 16 Jan 2014 00:10:34 +0000 (00:10 +0000)]
am
6ec44a88: Merge "Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore." into klp-docs
* commit '
6ec44a882b87fffb37e9dbafe8c5535f16faf349':
Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore.
Dirk Dougherty [Thu, 16 Jan 2014 00:08:53 +0000 (00:08 +0000)]
Merge "Doc change: add Drive API feature page. fix link text on several pages" into klp-docs
Dirk Dougherty [Thu, 16 Jan 2014 00:07:34 +0000 (00:07 +0000)]
Merge "Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore." into klp-docs
Wink Saville [Wed, 15 Jan 2014 23:57:10 +0000 (15:57 -0800)]
am
57756970: am
a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug
7637224"
* commit '
5775697029760ca886a287ef2c3119d5097ded56':
Fixed mistaken reference to "LTE". Bug
7637224
Wink Saville [Wed, 15 Jan 2014 23:49:14 +0000 (15:49 -0800)]
am
a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug
7637224"
* commit '
a6aa3199bdb676e349c28b861a04c34a4ec136e0':
Fixed mistaken reference to "LTE". Bug
7637224
Wink Saville [Wed, 15 Jan 2014 23:44:53 +0000 (23:44 +0000)]
Merge "Fixed mistaken reference to "LTE". Bug
7637224"
quddusc [Wed, 15 Jan 2014 23:40:55 +0000 (15:40 -0800)]
am
77916b9a: am
bf43ef27: Merge "docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature." into klp-docs
* commit '
77916b9ae1a5780f0aac46eb00d0fc835a8d6c84':
docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature.
quddusc [Wed, 15 Jan 2014 23:40:50 +0000 (15:40 -0800)]
am
57edc17c: am
563daeea: cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
* commit '
57edc17c398b3b438e1a3264219a6fa7f444341a':
cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
quddusc [Wed, 15 Jan 2014 23:37:08 +0000 (23:37 +0000)]
am
bf43ef27: Merge "docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature." into klp-docs
* commit '
bf43ef272ad386ad89d115ab8be1b706ae29034e':
docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature.
quddusc [Wed, 15 Jan 2014 23:37:04 +0000 (23:37 +0000)]
am
563daeea: cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
* commit '
563daeeaf11bb17c8570e11de63d1f1d6fb0c8bc':
cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
quddusc [Wed, 15 Jan 2014 23:34:49 +0000 (23:34 +0000)]
Merge "docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature." into klp-docs
Ricardo Cervera [Wed, 15 Jan 2014 23:16:30 +0000 (15:16 -0800)]
docs: Added calls to super.onDrawerZZZ() in the HTML for navigation samples. Bug:
11371890
HTML: http://quixote.mtv.corp.google.com:8104/training/implementing-navigation/nav-drawer.html
Change-Id: I08c63828b0250ca727b69dfbcf37f01a0328dcf9
quddusc [Wed, 4 Dec 2013 03:31:14 +0000 (19:31 -0800)]
cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
Change-Id: I6b00a0b0c209b2703db62ea7fd103ac6a58b36a8
Ricardo Cervera [Wed, 15 Jan 2014 21:50:43 +0000 (13:50 -0800)]
docs: Fixed typos in audio-focus.jd. Bug:
12528498
HTML: http://quixote.mtv.corp.google.com:8102/training/managing-audio/audio-focus.html
Change-Id: I2198e4e27661b374d7c812bc7f26658073feae20
Ricardo Cervera [Wed, 15 Jan 2014 21:11:13 +0000 (13:11 -0800)]
am
c919f4f4: am
bab2235a: Merge "docs: Aded uses-feature to multiple Google Play APK Filtering. Bug:
12271954" into klp-docs
* commit '
c919f4f47787245ddda32d0e41e7bae0facd0ee8':
docs: Aded uses-feature to multiple Google Play APK Filtering. Bug:
12271954
Ricardo Cervera [Wed, 15 Jan 2014 21:07:21 +0000 (21:07 +0000)]
am
bab2235a: Merge "docs: Aded uses-feature to multiple Google Play APK Filtering. Bug:
12271954" into klp-docs
* commit '
bab2235ae89e37452e9be8a8b6d2581fe59e0162':
docs: Aded uses-feature to multiple Google Play APK Filtering. Bug:
12271954
Ricardo Cervera [Wed, 15 Jan 2014 21:03:54 +0000 (21:03 +0000)]
Merge "docs: Aded uses-feature to multiple Google Play APK Filtering. Bug:
12271954" into klp-docs
Jeff Hao [Wed, 15 Jan 2014 19:41:30 +0000 (11:41 -0800)]
am
9a5005a3: am
f6730d26: Merge "Add sample profiling interface to startMethodTracing."
* commit '
9a5005a3bfa419cb856a83ca34a67556d9fd5b74':
Add sample profiling interface to startMethodTracing.
Jeff Hao [Wed, 15 Jan 2014 19:38:01 +0000 (11:38 -0800)]
am
f6730d26: Merge "Add sample profiling interface to startMethodTracing."
* commit '
f6730d26841377de0f7ee60fa78c6ef2f8be1f2e':
Add sample profiling interface to startMethodTracing.
Jeff Hao [Wed, 15 Jan 2014 19:34:39 +0000 (19:34 +0000)]
Merge "Add sample profiling interface to startMethodTracing."
Jeff Hao [Mon, 6 Jan 2014 23:52:52 +0000 (15:52 -0800)]
Add sample profiling interface to startMethodTracing.
Frameworks base side of this change. Also changed art and libcore.
Change-Id: Ib5ba0445163dca714d1ae66430750346ff8811be
Ricardo Cervera [Wed, 15 Jan 2014 19:25:10 +0000 (11:25 -0800)]
docs: Aded uses-feature to multiple Google Play APK Filtering. Bug:
12271954
Change-Id: I6c247e172b2a6dd0ef25afc6cf33f0960fc0fa8d
Review: http://quixote.mtv.corp.google.com:8101/google/play/publishing/multiple-apks.html
quddusc [Wed, 15 Jan 2014 18:00:53 +0000 (10:00 -0800)]
am
f4011173: am
31573d45: Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug:
9436754" into klp-docs
* commit '
f40111731581f03dc1b447b432331b3415fb87b9':
docs: Added link to in-app billing testing API guide and removed misleading statement. Bug:
9436754
quddusc [Wed, 15 Jan 2014 17:57:27 +0000 (17:57 +0000)]
am
31573d45: Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug:
9436754" into klp-docs
* commit '
31573d45933886237dd6414978486b79a4dd4f9f':
docs: Added link to in-app billing testing API guide and removed misleading statement. Bug:
9436754
quddusc [Wed, 15 Jan 2014 17:55:21 +0000 (17:55 +0000)]
Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug:
9436754" into klp-docs
Marco Nelissen [Wed, 15 Jan 2014 17:22:55 +0000 (09:22 -0800)]
am
0d4916f1: am
c3036a12: Merge "Before requerying a cursor, check if it is closed."
* commit '
0d4916f19f81f80fc83eb7646c6d339630d5f618':
Before requerying a cursor, check if it is closed.
Marco Nelissen [Wed, 15 Jan 2014 17:19:52 +0000 (09:19 -0800)]
am
c3036a12: Merge "Before requerying a cursor, check if it is closed."
* commit '
c3036a12467395465b86e6935af8aa500c1b128d':
Before requerying a cursor, check if it is closed.
Marco Nelissen [Wed, 15 Jan 2014 17:17:05 +0000 (17:17 +0000)]
Merge "Before requerying a cursor, check if it is closed."
Ashok Bhat [Wed, 8 Jan 2014 14:32:49 +0000 (14:32 +0000)]
AArch64: Use long for pointers in BitmapRegionDecoder
For storing pointers, long is used in BitmapRegionDecoder
class, as native pointers can be 64-bit.
In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)
In addition, Graphics.cpp has been changed to work
with modified BitmapRegionDecoder.
Change-Id: Id54087dd3bfb29577e8b762e70946793369dc701
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Ashok Bhat [Wed, 8 Jan 2014 16:47:08 +0000 (16:47 +0000)]
AArch64: Use long for pointers in Movie class
For storing pointers, long is used in Movie class,
as native pointers can be 64-bit.
In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)
Change-Id: I946325e4af6cb9282012bebdaee89e1117d8797b
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Ashok Bhat [Tue, 14 Jan 2014 10:52:35 +0000 (10:52 +0000)]
AArch64: Add AssetInputStream.getNativeAsset
This patch adds AssetInputStream.getNativeAsset. This function
returns asset pointer, which can then be passed to JNI functions.
Note that this function is hidden and not part of Android API.
This function will eventually replace getAssetInt,
once all the classes that use getAssetInt are changed
to use getNativeAsset instead.
Change-Id: I2a2b2e6864f1f57ae2b3a10c45559b3635266ed5
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Ashok Bhat [Mon, 6 Jan 2014 13:45:09 +0000 (13:45 +0000)]
AArch64: Use long for pointers in media classes
For storing pointers, long is used in media classes,
as native pointers can be 64-bit.
In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)
Change-Id: Idc4ca0124d03df7f9cef412488abafd020e5e774
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Scott Main [Fri, 6 Dec 2013 20:57:13 +0000 (12:57 -0800)]
Doc change: add Drive API feature page.
fix link text on several pages
Change-Id: I141e5b2cafe8c433861fa4f51aa9fc3843e7fba1
quddusc [Tue, 7 Jan 2014 00:28:03 +0000 (16:28 -0800)]
docs: Fixed typo in InstrumentationTestRunner page.
Bug:
11386360
Change-Id: I7626fe6fe1a22e223a8929ed3e5178c8df8966c9
quddusc [Tue, 14 Jan 2014 20:35:29 +0000 (12:35 -0800)]
am
916277e4: am
e7eb5996: Merge "docs: Removed stray link. Bug:
11773486" into klp-docs
* commit '
916277e415e6c8186b79dfe929114d36f80d9ee0':
docs: Removed stray link. Bug:
11773486
quddusc [Tue, 14 Jan 2014 20:35:24 +0000 (12:35 -0800)]
am
5e5c9833: am
cec51d66: Merge "docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug:
10797762" into klp-docs
* commit '
5e5c9833f533bb55964c7e981feacf191b63f09f':
docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug:
10797762
quddusc [Tue, 14 Jan 2014 20:35:18 +0000 (12:35 -0800)]
am
21627274: am
cc29a170: Merge "docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug:
11797515" into klp-docs
* commit '
21627274a0b1ddbf68599a3b5fe4bfa751885ddf':
docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug:
11797515
quddusc [Tue, 14 Jan 2014 20:35:14 +0000 (12:35 -0800)]
am
7c865524: am
64231d01: Merge "docs: Fixed typo in IAB training doc. Bug:
10807741" into klp-docs
* commit '
7c865524048695f5dc471e6a357a142cf60495a7':
docs: Fixed typo in IAB training doc. Bug:
10807741
quddusc [Tue, 14 Jan 2014 20:35:08 +0000 (12:35 -0800)]
am
c61e6bc6: am
72159ab0: Merge "docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug:
9316251" into klp-docs
* commit '
c61e6bc613db3d0d5ce7661bda3fe51ecc2f9726':
docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug:
9316251
quddusc [Tue, 14 Jan 2014 20:32:08 +0000 (20:32 +0000)]
am
e7eb5996: Merge "docs: Removed stray link. Bug:
11773486" into klp-docs
* commit '
e7eb5996c2cca421eb7d28325918db18044fe4f7':
docs: Removed stray link. Bug:
11773486
quddusc [Tue, 14 Jan 2014 20:32:04 +0000 (20:32 +0000)]
am
cec51d66: Merge "docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug:
10797762" into klp-docs
* commit '
cec51d6620c1e46c8e4b52f492ff4ed6d75b85a6':
docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug:
10797762
quddusc [Tue, 14 Jan 2014 20:32:00 +0000 (20:32 +0000)]
am
cc29a170: Merge "docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug:
11797515" into klp-docs
* commit '
cc29a17056e4ae656182bf2fb36536b25ab4fcae':
docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug:
11797515
quddusc [Tue, 14 Jan 2014 20:31:55 +0000 (20:31 +0000)]
am
64231d01: Merge "docs: Fixed typo in IAB training doc. Bug:
10807741" into klp-docs
* commit '
64231d01dead59752ff230570cbe07f206d5c9ec':
docs: Fixed typo in IAB training doc. Bug:
10807741
quddusc [Tue, 14 Jan 2014 20:31:51 +0000 (20:31 +0000)]
am
72159ab0: Merge "docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug:
9316251" into klp-docs
* commit '
72159ab085c48f4451ccf44a436e8b2122716fd4':
docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug:
9316251
quddusc [Tue, 14 Jan 2014 20:30:03 +0000 (20:30 +0000)]
Merge "docs: Removed stray link. Bug:
11773486" into klp-docs
quddusc [Tue, 14 Jan 2014 20:29:46 +0000 (20:29 +0000)]
Merge "docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug:
10797762" into klp-docs
quddusc [Tue, 14 Jan 2014 20:29:28 +0000 (20:29 +0000)]
Merge "docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug:
11797515" into klp-docs
quddusc [Tue, 14 Jan 2014 20:29:13 +0000 (20:29 +0000)]
Merge "docs: Fixed typo in IAB training doc. Bug:
10807741" into klp-docs
quddusc [Tue, 14 Jan 2014 20:28:55 +0000 (20:28 +0000)]
Merge "docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug:
9316251" into klp-docs
John Spurlock [Tue, 14 Jan 2014 19:54:25 +0000 (11:54 -0800)]
am
e05190ea: am
85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs
* commit '
e05190eae74be57dd517bb5afbccf901543329bf':
Docfixes: three typos and escape */*.
John Spurlock [Tue, 14 Jan 2014 19:50:38 +0000 (19:50 +0000)]
am
85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs
* commit '
85f98508366e8422f71553d2a5e682eb804c7419':
Docfixes: three typos and escape */*.
John Spurlock [Tue, 14 Jan 2014 19:48:12 +0000 (19:48 +0000)]
Merge "Docfixes: three typos and escape */*." into klp-docs
quddusc [Sat, 21 Dec 2013 00:26:23 +0000 (16:26 -0800)]
docs: Added link to in-app billing testing API guide and removed misleading statement.
Bug:
9436754
Change-Id: I7f08fbbd6c917a84ad1634ee956cd9c5112d3715
Ricardo Cervera [Tue, 14 Jan 2014 17:39:29 +0000 (09:39 -0800)]
am
7dde7879: am
1a21c16b: Merge "docs: Fixed typo in AlertDialog code snippet." into klp-docs
* commit '
7dde7879a4561a3ec9ffc48921a4d074e40aa74e':
docs: Fixed typo in AlertDialog code snippet.
Ricardo Cervera [Tue, 14 Jan 2014 17:36:07 +0000 (17:36 +0000)]
am
1a21c16b: Merge "docs: Fixed typo in AlertDialog code snippet." into klp-docs
* commit '
1a21c16b2bd74c022d6b83177027b78992dc42b5':
docs: Fixed typo in AlertDialog code snippet.
Ricardo Cervera [Tue, 14 Jan 2014 17:34:21 +0000 (17:34 +0000)]
Merge "docs: Fixed typo in AlertDialog code snippet." into klp-docs
Marco Nelissen [Tue, 14 Jan 2014 16:15:13 +0000 (08:15 -0800)]
am
a9045d24: am
337aa376: Merge "Add NULL check in updateProxyConfig"
* commit '
a9045d24a73faa6aa1e8ad204a1e14a53711a824':
Add NULL check in updateProxyConfig
Marco Nelissen [Tue, 14 Jan 2014 16:11:39 +0000 (08:11 -0800)]
am
337aa376: Merge "Add NULL check in updateProxyConfig"
* commit '
337aa376c09bb97a48afe075b4018f030445534f':
Add NULL check in updateProxyConfig
Marco Nelissen [Tue, 14 Jan 2014 16:08:18 +0000 (16:08 +0000)]
Merge "Add NULL check in updateProxyConfig"
Narayan Kamath [Tue, 14 Jan 2014 10:16:39 +0000 (02:16 -0800)]
am
2db26788: am
e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt.""
* commit '
2db26788ab367f08cb5378d77e22e8939e7a28c2':
Revert "Hide AssetInputStream.getAssetInt."
Narayan Kamath [Tue, 14 Jan 2014 10:13:45 +0000 (02:13 -0800)]
am
e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt.""
* commit '
e71afc2ea72e98c4631e79cad65f678090da87d3':
Revert "Hide AssetInputStream.getAssetInt."
Narayan Kamath [Tue, 14 Jan 2014 10:09:50 +0000 (10:09 +0000)]
Merge "Revert "Hide AssetInputStream.getAssetInt.""
Narayan Kamath [Tue, 14 Jan 2014 10:08:45 +0000 (10:08 +0000)]
Revert "Hide AssetInputStream.getAssetInt."
This reverts commit
842d44ec1765e01f4a37af99cc1935b4d0399758.
Change-Id: I188e49d3651fd4941491c239b6a7c9f475995187
Narayan Kamath [Tue, 14 Jan 2014 09:51:14 +0000 (01:51 -0800)]
am
80213160: am
ac8ccc3c: Merge "Hide AssetInputStream.getAssetInt."
* commit '
8021316010fb4bd18a29751949eb2cda66199b6e':
Hide AssetInputStream.getAssetInt.
Narayan Kamath [Tue, 14 Jan 2014 09:48:37 +0000 (01:48 -0800)]
am
ac8ccc3c: Merge "Hide AssetInputStream.getAssetInt."
* commit '
ac8ccc3c181a27103955b0f7bbf3dddabb0a6305':
Hide AssetInputStream.getAssetInt.
Narayan Kamath [Tue, 14 Jan 2014 09:45:40 +0000 (09:45 +0000)]
Merge "Hide AssetInputStream.getAssetInt."