OSDN Git Service
Joe Fernandez [Wed, 24 Sep 2014 15:56:02 +0000 (15:56 +0000)]
am
1968b919: am
b8a60dad: Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs
* commit '
1968b91937020e8aa826224642733bbb9055af2e':
docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
Joe Fernandez [Wed, 24 Sep 2014 15:44:50 +0000 (15:44 +0000)]
am
b8a60dad: Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs
* commit '
b8a60dada505d79341cfa4cc2b9906d892e8298b':
docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
Joe Fernandez [Wed, 24 Sep 2014 15:39:01 +0000 (15:39 +0000)]
Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs
Joe Fernandez [Fri, 19 Sep 2014 17:11:34 +0000 (10:11 -0700)]
docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
Change-Id: Iab735d07e705f019828d649e370fe5ef5006f305
Jeff Vander Stoep [Tue, 23 Sep 2014 17:26:47 +0000 (17:26 +0000)]
am
9aaf54ee: am
71b19fc3: am
5ba31e6e: am
bba79795: am
25c866a8: am
e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev
* commit '
9aaf54eeb6c1dd83090235a8df5476b2f2f6473e':
Sanity-check paths of files to be restored
Jeff Vander Stoep [Tue, 23 Sep 2014 17:26:42 +0000 (17:26 +0000)]
am
1cf337a2: am
52824dab: am
1b4f1a79: am
1c2eaa78: am
660af7eb: am
59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
* commit '
1cf337a222bbb0e26445e7904ece687af93aac48':
Change permission guard on bindBackupAgent()
Jeff Vander Stoep [Tue, 23 Sep 2014 17:12:38 +0000 (17:12 +0000)]
am
71b19fc3: am
5ba31e6e: am
bba79795: am
25c866a8: am
e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev
* commit '
71b19fc301ff08bd13d394dfa9ef6a3f535b149e':
Sanity-check paths of files to be restored
Jeff Vander Stoep [Tue, 23 Sep 2014 17:11:58 +0000 (17:11 +0000)]
am
52824dab: am
1b4f1a79: am
1c2eaa78: am
660af7eb: am
59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
* commit '
52824dab7ba48713411ff3a26580b29aa2088242':
Change permission guard on bindBackupAgent()
Jeff Vander Stoep [Tue, 23 Sep 2014 17:02:13 +0000 (17:02 +0000)]
am
5ba31e6e: am
bba79795: am
25c866a8: am
e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev
* commit '
5ba31e6e9afb34781fe5b927354502d9c6190bc5':
Sanity-check paths of files to be restored
Jeff Vander Stoep [Tue, 23 Sep 2014 17:02:04 +0000 (17:02 +0000)]
am
1b4f1a79: am
1c2eaa78: am
660af7eb: am
59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
* commit '
1b4f1a794dc90c1ea877af64e8340afe6146584a':
Change permission guard on bindBackupAgent()
Jeff Vander Stoep [Tue, 23 Sep 2014 16:50:29 +0000 (16:50 +0000)]
am
bba79795: am
25c866a8: am
e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev
* commit '
bba797957a83b0ee8869cfa8a9427f6506f74fa4':
Sanity-check paths of files to be restored
Jeff Vander Stoep [Tue, 23 Sep 2014 16:50:16 +0000 (16:50 +0000)]
am
1c2eaa78: am
660af7eb: am
59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
* commit '
1c2eaa784b2376b674cf438f42342271c8aa79a8':
Change permission guard on bindBackupAgent()
Jeff Vander Stoep [Tue, 23 Sep 2014 16:34:53 +0000 (16:34 +0000)]
am
25c866a8: am
e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev
* commit '
25c866a8efa148886280b34c0413a1c2c20c247f':
Sanity-check paths of files to be restored
Jeff Vander Stoep [Tue, 23 Sep 2014 16:24:36 +0000 (16:24 +0000)]
am
e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev
* commit '
e2adb1ff4af09d66096df64461c80d4126ab2692':
Sanity-check paths of files to be restored
Jeff Vander Stoep [Tue, 23 Sep 2014 16:13:41 +0000 (16:13 +0000)]
Merge "Sanity-check paths of files to be restored" into jb-mr2-dev
Jeff Vander Stoep [Mon, 22 Sep 2014 22:15:58 +0000 (15:15 -0700)]
Sanity-check paths of files to be restored
(cherry picked from commit
7d51cc701a6735cf455af8479f56c9c0b2109e02)
Bug:
16298491
Change-Id: I0c2d6523c9d152dad4d27d06d3853afd432e5af7
Ricardo Cervera [Mon, 22 Sep 2014 21:44:13 +0000 (21:44 +0000)]
am
4d0f84bb: am
556f23aa: Merge "docs: Fixed Developer Tools image. Bug:
17609483" into klp-modular-docs
* commit '
4d0f84bb55957c0f5372b53fe94ddfb53c9d0cf8':
docs: Fixed Developer Tools image. Bug:
17609483
Ricardo Cervera [Mon, 22 Sep 2014 21:37:06 +0000 (21:37 +0000)]
am
556f23aa: Merge "docs: Fixed Developer Tools image. Bug:
17609483" into klp-modular-docs
* commit '
556f23aa1ae01832611e5e3b4059b47e6a7a00fb':
docs: Fixed Developer Tools image. Bug:
17609483
Ricardo Cervera [Mon, 22 Sep 2014 21:26:34 +0000 (21:26 +0000)]
Merge "docs: Fixed Developer Tools image. Bug:
17609483" into klp-modular-docs
David Friedman [Mon, 22 Sep 2014 20:51:29 +0000 (20:51 +0000)]
am
6bacce4f: am
8dcf1c32: Fixes two typos, one in each file.
* commit '
6bacce4f24ca05fc95c38ea1e7df75dd176b81c2':
Fixes two typos, one in each file.
David Friedman [Mon, 22 Sep 2014 20:41:17 +0000 (20:41 +0000)]
am
8dcf1c32: Fixes two typos, one in each file.
* commit '
8dcf1c32299e2c1c58c053925c572d58f2a74ee9':
Fixes two typos, one in each file.
Ricardo Cervera [Mon, 22 Sep 2014 19:55:43 +0000 (12:55 -0700)]
docs: Fixed Developer Tools image. Bug:
17609483
Change-Id: I400713dfe5ca54da193dccf15dac117dc4e11ca2
David Friedman [Fri, 19 Sep 2014 01:24:49 +0000 (18:24 -0700)]
Fixes two typos, one in each file.
Change-Id: I5f4a9100d20f8ad50052d63dc106a030ac75b1b0
Dirk Dougherty [Thu, 18 Sep 2014 01:00:09 +0000 (01:00 +0000)]
am
496cfbf7: Doc change: Add IAB v2 deprecation notice.
* commit '
496cfbf7a83e4c0f66ece27f36c2dc3d31994ff1':
Doc change: Add IAB v2 deprecation notice.
Dirk Dougherty [Wed, 17 Sep 2014 22:20:38 +0000 (15:20 -0700)]
Doc change: Add IAB v2 deprecation notice.
Change-Id: Ide22c4aa8c56fdd83cb6ce2989eb8c449c55c7c1
Conflicts:
docs/html/google/play/billing/index.jd
Robert Ly [Wed, 17 Sep 2014 15:33:16 +0000 (15:33 +0000)]
am
9efd9f60: am
fc95c477: docs: edu changes for launch
* commit '
9efd9f607006b3e02cda714901884e1ce22475d3':
docs: edu changes for launch
Robert Ly [Wed, 17 Sep 2014 15:19:15 +0000 (15:19 +0000)]
am
fc95c477: docs: edu changes for launch
* commit '
fc95c477835f86d99cf8c7ce5c1dd098fa42e69c':
docs: edu changes for launch
Robert Ly [Fri, 12 Sep 2014 17:19:40 +0000 (10:19 -0700)]
docs: edu changes for launch
Change-Id: Ia9047138bd9972e572b5dd93310339b630a2810d
Andrew Solovay [Wed, 17 Sep 2014 06:12:12 +0000 (06:12 +0000)]
am
6c6664c9: am
a209406f: Merge "Docs: Updated to include new Subscriptions functionality." into klp-modular-docs
* commit '
6c6664c95d7935398909e798e0aad451a2a83b1b':
Docs: Updated to include new Subscriptions functionality.
Andrew Solovay [Wed, 17 Sep 2014 06:01:09 +0000 (06:01 +0000)]
am
a209406f: Merge "Docs: Updated to include new Subscriptions functionality." into klp-modular-docs
* commit '
a209406faa1f2b0f1dd7b6e3c5a468729f1c562f':
Docs: Updated to include new Subscriptions functionality.
Andrew Solovay [Wed, 17 Sep 2014 02:21:09 +0000 (02:21 +0000)]
Merge "Docs: Updated to include new Subscriptions functionality." into klp-modular-docs
Robert Ly [Mon, 15 Sep 2014 22:03:04 +0000 (22:03 +0000)]
am
d00b110a: am
e152b793: docs: remove fire and forget language from wear docs
* commit '
d00b110a3b9991553806d196f1115a510a72210c':
docs: remove fire and forget language from wear docs
Robert Ly [Mon, 15 Sep 2014 19:27:18 +0000 (19:27 +0000)]
am
e152b793: docs: remove fire and forget language from wear docs
* commit '
e152b793e5f56ac9d73d0b3e3e191fea6b0ba1e5':
docs: remove fire and forget language from wear docs
Robert Ly [Mon, 15 Sep 2014 17:46:23 +0000 (10:46 -0700)]
docs: remove fire and forget language from wear docs
Change-Id: I0a8d83ba0db24f1232d4c729f298c6af04c048b3
Joe Fernandez [Sat, 13 Sep 2014 00:00:29 +0000 (00:00 +0000)]
am
02480cbf: am
1b12b1dc: Merge "docs: remove bad link in the quick view box for TV Recommendations #2" into klp-modular-docs
* commit '
02480cbffabd1ca80441c9676db01b177468883a':
docs: remove bad link in the quick view box for TV Recommendations #2
Joe Fernandez [Fri, 12 Sep 2014 23:42:04 +0000 (23:42 +0000)]
am
1b12b1dc: Merge "docs: remove bad link in the quick view box for TV Recommendations #2" into klp-modular-docs
* commit '
1b12b1dc6f0203913ceb0a88dcf5ef1639fe6515':
docs: remove bad link in the quick view box for TV Recommendations #2
Joe Fernandez [Fri, 12 Sep 2014 23:28:53 +0000 (23:28 +0000)]
Merge "docs: remove bad link in the quick view box for TV Recommendations #2" into klp-modular-docs
Joe Fernandez [Fri, 12 Sep 2014 23:24:01 +0000 (16:24 -0700)]
docs: remove bad link in the quick view box for TV Recommendations #2
Change-Id: I649d8d735bda2b0c657217bc86c1a29a2d7eddc2
kmccormick [Fri, 12 Sep 2014 19:07:21 +0000 (19:07 +0000)]
am
f530df1c: am
7392152b: Doc Update: update Cloud Platform link
* commit '
f530df1c7ec39fb15e284dc18942276d85c740a2':
Doc Update: update Cloud Platform link
kmccormick [Fri, 12 Sep 2014 18:49:18 +0000 (18:49 +0000)]
am
7392152b: Doc Update: update Cloud Platform link
* commit '
7392152ba21917aff15db89988e1317819b5dd72':
Doc Update: update Cloud Platform link
kmccormick [Fri, 12 Sep 2014 01:25:42 +0000 (18:25 -0700)]
Doc Update: update Cloud Platform link
Fix for:
b/
17411644
Change-Id: I3893ed25d7b058e2635a56113af74d20284688af
Jeff Vander Stoep [Thu, 11 Sep 2014 18:58:49 +0000 (18:58 +0000)]
am
660af7eb: am
59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
* commit '
660af7eb1a55e2df7da45aa63ca227141ef86b34':
Change permission guard on bindBackupAgent()
Jeff Vander Stoep [Thu, 11 Sep 2014 18:47:53 +0000 (18:47 +0000)]
am
59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
* commit '
59c1202e10c53587222a98e8c2f6ee3ff0fa1c3f':
Change permission guard on bindBackupAgent()
Jeff Vander Stoep [Thu, 11 Sep 2014 18:41:09 +0000 (18:41 +0000)]
Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
Jon Larimer [Thu, 11 Sep 2014 16:44:26 +0000 (16:44 +0000)]
am
d65ab587: am
e2b12b1f: am
61c6ff7b: Merge "Fix issue #
16794553: Duplicate ArrayMap entries in Bundle..." into klp-dev
* commit '
d65ab587052934c42769b2d4cf8ec5fa70ef13f8':
Fix issue #
16794553: Duplicate ArrayMap entries in Bundle...
Jon Larimer [Thu, 11 Sep 2014 16:33:07 +0000 (16:33 +0000)]
am
e2b12b1f: am
61c6ff7b: Merge "Fix issue #
16794553: Duplicate ArrayMap entries in Bundle..." into klp-dev
* commit '
e2b12b1fbc2880bf895fa2a9adcf65de3162c28f':
Fix issue #
16794553: Duplicate ArrayMap entries in Bundle...
Jon Larimer [Thu, 11 Sep 2014 16:23:39 +0000 (16:23 +0000)]
am
61c6ff7b: Merge "Fix issue #
16794553: Duplicate ArrayMap entries in Bundle..." into klp-dev
* commit '
61c6ff7b70e2d42b44d5c5f9c3c8e3c67b584a76':
Fix issue #
16794553: Duplicate ArrayMap entries in Bundle...
Jon Larimer [Thu, 11 Sep 2014 16:15:24 +0000 (16:15 +0000)]
Merge "Fix issue #
16794553: Duplicate ArrayMap entries in Bundle..." into klp-dev
Jean-Michel Trivi [Thu, 11 Sep 2014 04:33:36 +0000 (04:33 +0000)]
am
4fa904ab: am
9513f81e: am
24499ba7: am
e1f07060: (-s ours) am
e825f0ee: am
60f22fbf: Do not restore the media button event receiver
* commit '
4fa904aba2d60ca8bce39b30264076d8eec7a904':
Do not restore the media button event receiver
Jean-Michel Trivi [Thu, 11 Sep 2014 04:23:21 +0000 (04:23 +0000)]
am
9513f81e: am
24499ba7: am
e1f07060: (-s ours) am
e825f0ee: am
60f22fbf: Do not restore the media button event receiver
* commit '
9513f81e33bc0da445735257c8de11a38f3775fa':
Do not restore the media button event receiver
Jean-Michel Trivi [Thu, 11 Sep 2014 04:16:10 +0000 (04:16 +0000)]
am
24499ba7: am
e1f07060: (-s ours) am
e825f0ee: am
60f22fbf: Do not restore the media button event receiver
* commit '
24499ba7ff79c8fa2ea9e02256366c43e78f66c0':
Do not restore the media button event receiver
Jean-Michel Trivi [Thu, 11 Sep 2014 00:51:32 +0000 (00:51 +0000)]
am
e1f07060: (-s ours) am
e825f0ee: am
60f22fbf: Do not restore the media button event receiver
* commit '
e1f07060b8c94cc02309172fb9fb8cd4bd0e35f7':
Do not restore the media button event receiver
Ricardo Cervera [Thu, 11 Sep 2014 00:19:11 +0000 (00:19 +0000)]
am
4232a59b: am
d086db30: Merge "cherrypick from klp-modular-dev docs: Added note on disabling debugging for WebView apps. Bug:
16232761 Change-Id: I6cdc2ef7da87e78ec42a456d232a8e46a26c7365" into klp-modular-docs
* commit '
4232a59b083f4062e127b4de4663348b3e08b1bd':
cherrypick from klp-modular-dev docs: Added note on disabling debugging for WebView apps. Bug:
16232761 Change-Id: I6cdc2ef7da87e78ec42a456d232a8e46a26c7365
Ricardo Cervera [Thu, 11 Sep 2014 00:19:06 +0000 (00:19 +0000)]
am
02afa734: am
a6c12f01: Merge "docs: Fixed minor bug in downloads class. Bug:
16948533" into klp-modular-docs
* commit '
02afa7348b7b6b41d24f4d401d07ed3cea4b5066':
docs: Fixed minor bug in downloads class. Bug:
16948533
Ricardo Cervera [Thu, 11 Sep 2014 00:06:13 +0000 (00:06 +0000)]
am
d086db30: Merge "cherrypick from klp-modular-dev docs: Added note on disabling debugging for WebView apps. Bug:
16232761 Change-Id: I6cdc2ef7da87e78ec42a456d232a8e46a26c7365" into klp-modular-docs
* commit '
d086db30d0f097f34eae0a9a3d443e11cc230d62':
cherrypick from klp-modular-dev docs: Added note on disabling debugging for WebView apps. Bug:
16232761 Change-Id: I6cdc2ef7da87e78ec42a456d232a8e46a26c7365
Ricardo Cervera [Thu, 11 Sep 2014 00:06:10 +0000 (00:06 +0000)]
am
a6c12f01: Merge "docs: Fixed minor bug in downloads class. Bug:
16948533" into klp-modular-docs
* commit '
a6c12f0189c92b556fd7c3af3d8466d9b6d828c9':
docs: Fixed minor bug in downloads class. Bug:
16948533
Ricardo Cervera [Wed, 10 Sep 2014 23:57:45 +0000 (23:57 +0000)]
Merge "cherrypick from klp-modular-dev docs: Added note on disabling debugging for WebView apps. Bug:
16232761 Change-Id: I6cdc2ef7da87e78ec42a456d232a8e46a26c7365" into klp-modular-docs
Ricardo Cervera [Wed, 10 Sep 2014 23:57:15 +0000 (23:57 +0000)]
Merge "docs: Fixed minor bug in downloads class. Bug:
16948533" into klp-modular-docs
Dianne Hackborn [Wed, 13 Aug 2014 22:39:50 +0000 (15:39 -0700)]
Fix issue #
16794553: Duplicate ArrayMap entries in Bundle...
...can lead to launching of un-exported activities
We now validate the array map after unparcelling to make sure there
are no duplicate keys.
And to make up for the performance overhead this introduces, I switched
the parcelling/unparcelling code to write keys as explicit string
objects rather than generic values. There was no reason to use generic
values since the write method itself only accepts an array map with
String keys.
Change-Id: I57bda9eb79ceaaa9c1b94ad49d9e462b52102149
(cherry picked from commit
cee4cdad307071a8ff9a3e2189bf9e6fcc417222)
Jeff Vander Stoep [Wed, 10 Sep 2014 21:20:14 +0000 (14:20 -0700)]
Change permission guard on bindBackupAgent()
Bug:
15829193
Change-Id: I6c1c39923b7b1a9f528f97da10913cb7f2d7e8f9
Jean-Michel Trivi [Wed, 10 Sep 2014 20:59:32 +0000 (20:59 +0000)]
am
e825f0ee: am
60f22fbf: Do not restore the media button event receiver
* commit '
e825f0eec571831ceb60e65ec7e2a6b1ed7be5bd':
Do not restore the media button event receiver
Jean-Michel Trivi [Wed, 10 Sep 2014 20:47:57 +0000 (20:47 +0000)]
am
60f22fbf: Do not restore the media button event receiver
* commit '
60f22fbf67a69e8f3604afb46ccd7c3bd2819cb1':
Do not restore the media button event receiver
Robert Ly [Wed, 10 Sep 2014 18:16:12 +0000 (18:16 +0000)]
am
5debe44b: am
0743bca5: docs: add 64k method limit note
* commit '
5debe44b88e41b61ecbbc48c60a006cd6abd734d':
docs: add 64k method limit note
Andrew Solovay [Thu, 21 Aug 2014 18:16:47 +0000 (11:16 -0700)]
Docs: Updated to include new Subscriptions functionality.
Includes refund/revoke, seasonal subscriptions, etc.
Docs are staged to:
http://asolovay.mtv:9393/google/play/billing/index.html
http://asolovay.mtv:9393/google/play/billing/billing_subscriptions.html
Change-Id: Id8ad33025c2ae165d6fc5e050c4f2aef70acc0d0
Robert Ly [Wed, 10 Sep 2014 18:04:16 +0000 (18:04 +0000)]
am
0743bca5: docs: add 64k method limit note
* commit '
0743bca58961582078f4e8199fe9a6fa044036eb':
docs: add 64k method limit note
Robert Ly [Wed, 10 Sep 2014 17:50:46 +0000 (10:50 -0700)]
docs: add 64k method limit note
Change-Id: I6590fc996331c1f2024276d338c4035f2cb0f18d
Jean-Michel Trivi [Wed, 10 Sep 2014 16:15:50 +0000 (09:15 -0700)]
Do not restore the media button event receiver
Do not restore the media button event receiver on behalf of the
application that registered. Prevents reported vulnerability.
Bug
15428797
Change-Id: If40ee6bc0c77c191643129daa92eb26755e70cb0
Robert Ly [Tue, 9 Sep 2014 23:51:10 +0000 (23:51 +0000)]
am
9f60bc3f: am
52a18161: docs: update api dashboard for september
* commit '
9f60bc3f129037f2f1b05a09902c8e97d66322f3':
docs: update api dashboard for september
Robert Ly [Tue, 9 Sep 2014 23:40:51 +0000 (23:40 +0000)]
am
52a18161: docs: update api dashboard for september
* commit '
52a1816180c7a85b13c543a5cdb6a7506cb8f01d':
docs: update api dashboard for september
Robert Ly [Tue, 9 Sep 2014 22:40:50 +0000 (15:40 -0700)]
docs: update api dashboard for september
Change-Id: Icae4efd0729b61c0f6c1850da641bc065bc12122
Dirk Dougherty [Mon, 8 Sep 2014 23:59:34 +0000 (23:59 +0000)]
am
604ae4c7: am
552e5ce6: Merge "Doc change: Add note to use explicit intent when binding to billing service." into klp-modular-docs
* commit '
604ae4c79e67be6be19724e03f35b9e6cc3fd617':
Doc change: Add note to use explicit intent when binding to billing service.
Dirk Dougherty [Mon, 8 Sep 2014 23:53:32 +0000 (23:53 +0000)]
am
552e5ce6: Merge "Doc change: Add note to use explicit intent when binding to billing service." into klp-modular-docs
* commit '
552e5ce6bb418b9a8b3b1ba9c102c562d0a4019e':
Doc change: Add note to use explicit intent when binding to billing service.
Dirk Dougherty [Mon, 8 Sep 2014 23:46:55 +0000 (23:46 +0000)]
Merge "Doc change: Add note to use explicit intent when binding to billing service." into klp-modular-docs
Robert Ly [Mon, 8 Sep 2014 22:51:20 +0000 (22:51 +0000)]
am
aa19f1fc: am
b5a21ad3: Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html""
* commit '
aa19f1fccb12eb141af92837aded0478006ab935':
Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html""
Robert Ly [Mon, 8 Sep 2014 22:43:42 +0000 (22:43 +0000)]
am
b5a21ad3: Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html""
* commit '
b5a21ad3fba1d8d3b096a0d685d71c148fefa11b':
Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html""
Robert Ly [Mon, 8 Sep 2014 22:30:09 +0000 (22:30 +0000)]
Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html""
This reverts commit
4186379a2a37123d31ce5d1aff1facc8e7dfbfd3.
Change-Id: I34a7b8689362053c0ad8124eaa3f40a5c282bc80
David Friedman [Mon, 8 Sep 2014 22:26:59 +0000 (22:26 +0000)]
am
32079484: am
4186379a: Revert "NDKr10b changes to be published to DAC NDK page. Staged at: boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"
* commit '
3207948444ed39b867c14cfc314b8caaf60fe571':
Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"
David Friedman [Mon, 8 Sep 2014 22:26:53 +0000 (22:26 +0000)]
am
7e8786d9: am
c6142d97: NDKr10b changes to be published to DAC NDK page. Staged at: boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html
* commit '
7e8786d9755526a2d29c10c60759eb1c290afa38':
NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html
David Friedman [Mon, 8 Sep 2014 22:13:09 +0000 (22:13 +0000)]
am
4186379a: Revert "NDKr10b changes to be published to DAC NDK page. Staged at: boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"
* commit '
4186379a2a37123d31ce5d1aff1facc8e7dfbfd3':
Revert "NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"
David Friedman [Mon, 8 Sep 2014 22:13:05 +0000 (22:13 +0000)]
am
c6142d97: NDKr10b changes to be published to DAC NDK page. Staged at: boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html
* commit '
c6142d97d79bc6a5ce2bb77fce9ae5d988f49542':
NDKr10b changes to be published to DAC NDK page. Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html
David Friedman [Mon, 8 Sep 2014 21:58:22 +0000 (21:58 +0000)]
Revert "NDKr10b changes to be published to DAC NDK page. Staged at: boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"
This reverts commit
c6142d97d79bc6a5ce2bb77fce9ae5d988f49542.
Change-Id: Idc6fde822bf42300897d96fc934a94e6b9418d76
David Friedman [Tue, 26 Aug 2014 20:53:15 +0000 (13:53 -0700)]
NDKr10b changes to be published to DAC NDK page.
Staged at: http://boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html
Change-Id: I559068eb1567bc03f69cadade5073f419635ad69
Wei Liu [Fri, 5 Sep 2014 16:52:20 +0000 (16:52 +0000)]
am
636f3eac: Add clear_top flag to settings action intent. Bug:
17200185
* commit '
636f3eac6d3ae69e7cc1dd159fe7cdbb043ce2df':
Add clear_top flag to settings action intent. Bug:
17200185
Wei Liu [Thu, 4 Sep 2014 05:10:57 +0000 (22:10 -0700)]
Add clear_top flag to settings action intent.
Bug:
17200185
Change-Id: I156a8726055452b56d8ccd52010cdea8baaa79c3
Deepanshu Gupta [Thu, 4 Sep 2014 18:17:42 +0000 (18:17 +0000)]
am
9bfa0736: am
7119fbb6: am
4df075bc: am
057eb404: (-s ours) am
a5176670: am
033a54ec: am
c33fc8de: (-s ours) am
48349ea9: am
66224e25: am
12bbbb2b: am
d3328343: am
f264080d: am
3ce96efc: am
d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into
* commit '
9bfa073662748e2d0b4b08cfa7fa312e7023f75c':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 18:17:38 +0000 (18:17 +0000)]
am
8929642c: am
0ff5117f: am
7055778e: am
a9f56d5a: (-s ours) am
44db2b3e: am
5d1755e9: am
c634383a: (-s ours) am
8bc68f96: am
52ee9b99: am
ffd0e8bf: am
a6f32d7f: am
64d4ef8c: am
63889480: am
6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
8929642ca72981f3c5cd4e7d408d47c724d9127b':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 18:17:32 +0000 (18:17 +0000)]
am
889ec192: am
a7ce1107: am
19fa86cf: am
5384d40e: (-s ours) am
b79bb54e: am
f4ba8731: am
338e32ba: (-s ours) am
6c1bf6b1: am
2db4037c: am
4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
889ec19249fecfa7121c77b4c2bb32a054311cb5':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 18:17:28 +0000 (18:17 +0000)]
am
9f7c594a: am
ae6f2595: am
409e42a1: am
e19464aa: (-s ours) am
9ee1556d: am
296b120c: am
a82db08e: (-s ours) am
e73e14fd: am
8ed784e2: am
edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
9f7c594a05411191d83ccb21655fbd8d52f56189':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Jean-Michel Trivi [Thu, 4 Sep 2014 18:17:24 +0000 (18:17 +0000)]
am
525e552e: am
800f3ca4: am
14c8acef: am
5fb35780: am
daf113b1: am
5c6248c9: am
1310a1cd: (-s ours) am
ec50dfc0: am
20fc473c: am
f0336eb8: am
2cb287f9: am
9ea996a3: Do not restore the media button event receiver
* commit '
525e552eef3e38f3ab1a61377ebe69af43e959d7':
Do not restore the media button event receiver
Deepanshu Gupta [Thu, 4 Sep 2014 18:10:53 +0000 (18:10 +0000)]
am
7119fbb6: am
4df075bc: am
057eb404: (-s ours) am
a5176670: am
033a54ec: am
c33fc8de: (-s ours) am
48349ea9: am
66224e25: am
12bbbb2b: am
d3328343: am
f264080d: am
3ce96efc: am
d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev
* commit '
7119fbb63a32f4f51bf07293c0a7f5a3a32abba0':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 18:10:50 +0000 (18:10 +0000)]
am
0ff5117f: am
7055778e: am
a9f56d5a: (-s ours) am
44db2b3e: am
5d1755e9: am
c634383a: (-s ours) am
8bc68f96: am
52ee9b99: am
ffd0e8bf: am
a6f32d7f: am
64d4ef8c: am
63889480: am
6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
0ff5117fb3aebfd64ffe26ff68308632c7ceeb3d':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 18:10:39 +0000 (18:10 +0000)]
am
a7ce1107: am
19fa86cf: am
5384d40e: (-s ours) am
b79bb54e: am
f4ba8731: am
338e32ba: (-s ours) am
6c1bf6b1: am
2db4037c: am
4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
a7ce11070a74f7a0447f0d40d51cb0d3f95999fd':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 18:10:35 +0000 (18:10 +0000)]
am
ae6f2595: am
409e42a1: am
e19464aa: (-s ours) am
9ee1556d: am
296b120c: am
a82db08e: (-s ours) am
e73e14fd: am
8ed784e2: am
edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
ae6f2595206d33f04c951c2f3dfff5ede100c942':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Jean-Michel Trivi [Thu, 4 Sep 2014 18:10:31 +0000 (18:10 +0000)]
am
800f3ca4: am
14c8acef: am
5fb35780: am
daf113b1: am
5c6248c9: am
1310a1cd: (-s ours) am
ec50dfc0: am
20fc473c: am
f0336eb8: am
2cb287f9: am
9ea996a3: Do not restore the media button event receiver
* commit '
800f3ca4ddf52fe46d039505266c84b0ad0234b1':
Do not restore the media button event receiver
Deepanshu Gupta [Thu, 4 Sep 2014 17:59:47 +0000 (17:59 +0000)]
am
4df075bc: am
057eb404: (-s ours) am
a5176670: am
033a54ec: am
c33fc8de: (-s ours) am
48349ea9: am
66224e25: am
12bbbb2b: am
d3328343: am
f264080d: am
3ce96efc: am
d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev
* commit '
4df075bcb5770ba411b6a32c9daeac24da0597e2':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 17:59:44 +0000 (17:59 +0000)]
am
7055778e: am
a9f56d5a: (-s ours) am
44db2b3e: am
5d1755e9: am
c634383a: (-s ours) am
8bc68f96: am
52ee9b99: am
ffd0e8bf: am
a6f32d7f: am
64d4ef8c: am
63889480: am
6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
7055778ef5e97f6f83181a44c9b3804632f6f64e':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 17:59:41 +0000 (17:59 +0000)]
am
19fa86cf: am
5384d40e: (-s ours) am
b79bb54e: am
f4ba8731: am
338e32ba: (-s ours) am
6c1bf6b1: am
2db4037c: am
4f53d92c: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
19fa86cfd6fddb63715b50a4e0bc881d2ea34133':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 17:59:38 +0000 (17:59 +0000)]
am
409e42a1: am
e19464aa: (-s ours) am
9ee1556d: am
296b120c: am
a82db08e: (-s ours) am
e73e14fd: am
8ed784e2: am
edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
409e42a17eeedf125d012ebc3f1d91fcf5812573':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Jean-Michel Trivi [Thu, 4 Sep 2014 17:59:35 +0000 (17:59 +0000)]
am
14c8acef: am
5fb35780: am
daf113b1: am
5c6248c9: am
1310a1cd: (-s ours) am
ec50dfc0: am
20fc473c: am
f0336eb8: am
2cb287f9: am
9ea996a3: Do not restore the media button event receiver
* commit '
14c8acef21136a07e5e750b245874d779f410b53':
Do not restore the media button event receiver
Deepanshu Gupta [Thu, 4 Sep 2014 17:46:19 +0000 (17:46 +0000)]
am
057eb404: (-s ours) am
a5176670: am
033a54ec: am
c33fc8de: (-s ours) am
48349ea9: am
66224e25: am
12bbbb2b: am
d3328343: am
f264080d: am
3ce96efc: am
d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev
* commit '
057eb404363184b75ab0e5d3768a22126703f750':
Resolve color xml attributes properly. [DO NOT MERGE]
OSDN Git Service
