Katie McCormick
37f0af99ce
am 474f356c: am 9c662274: am c1291f70: am c5b47cff: resolved conflicts for merge of 7f9a0535 to jb-mr1-dev
...
* commit '474f356cdd4651ab44eeb3aab077ecf8fcf261e7':
Doc change: GCM category & dry_run params
2012-11-12 12:14:28 -08:00
Katie McCormick
474f356cdd
am 9c662274: am c1291f70: am c5b47cff: resolved conflicts for merge of 7f9a0535 to jb-mr1-dev
...
* commit '9c66227406bb9c84948a531ec3c4be3641329ddc':
Doc change: GCM category & dry_run params
2012-11-12 12:11:48 -08:00
Katie McCormick
c5b47cff88
resolved conflicts for merge of 7f9a0535 to jb-mr1-dev
...
Change-Id: I8aee63b128a833ff8c2aaf2167850815033766dd
2012-11-12 10:07:09 -08:00
Kenny Root
7b172a49a9
am 58ed5d74: am 768d9e1a: Merge "Correct executable bit for source files"
...
* commit '58ed5d748c0b9b64845975ef5844ad313de7c3f6':
Correct executable bit for source files
2012-11-07 13:08:25 -08:00
Kenny Root
58ed5d748c
am 768d9e1a: Merge "Correct executable bit for source files"
...
* commit '768d9e1a72ceee7d4a5f608776b87b62d6ce4a04':
Correct executable bit for source files
2012-11-07 11:52:12 -08:00
Kenny Root
3a084af2e9
Correct executable bit for source files
...
Many media files and source code files were marked as executable in Git.
Remove those.
Also a shell script and python script were not marked as executable.
Change-Id: Ieb51bafb46c895a21d2e83696f5a901ba752b2c5
2012-11-07 10:27:31 -08:00
kmccormick@google.com
7f9a053580
am 856e24d8: am fa2dbd69: Merge "Doc change: GCM category & dry_run params" into jb-dev-docs
...
* commit '856e24d82a5009db69058b6c37cbbe1af3b292f7':
Doc change: GCM category & dry_run params
2012-11-06 15:59:33 -08:00
kmccormick@google.com
856e24d82a
am fa2dbd69: Merge "Doc change: GCM category & dry_run params" into jb-dev-docs
...
* commit 'fa2dbd693c3ffebd806cbbb4f708f754d58423ed':
Doc change: GCM category & dry_run params
2012-11-06 15:56:25 -08:00
&& repo sync -j8
fa2dbd693c
Merge "Doc change: GCM category & dry_run params" into jb-dev-docs
2012-11-06 10:38:45 -08:00
Scott Main
500d05e573
am 02acfc79: am 6a66cfce: am 465c3753: Merge "docs: misc changes for new manifest attributes, including fix for bug 7443821 bug 7442263" into jb-mr1-dev
...
* commit '02acfc79c18bf5bbe5e6456d8767c53a3b8de6eb':
docs: misc changes for new manifest attributes, including fix for bug 7443821 bug 7442263
2012-11-01 15:23:58 -07:00
Scott Main
465c37533a
Merge "docs: misc changes for new manifest attributes, including fix for bug 7443821 bug 7442263" into jb-mr1-dev
2012-11-01 15:14:25 -07:00
Robert Ly
d1a448653d
am 72789bdc: am 1fcc8f48: am f9e7b618: am 93a9a0a2: am 0fc15da0: am 677c1e14: Merge "docs: google market -> google play" into jb-dev-docs
...
* commit '72789bdcff08be2121081013bb39675b170c66c5':
docs: google market -> google play
2012-11-01 14:30:20 -07:00
Robert Ly
f9e7b61867
am 93a9a0a2: am 0fc15da0: am 677c1e14: Merge "docs: google market -> google play" into jb-dev-docs
...
* commit '93a9a0a2bc2173d942f2c37d0751a9e4df8ecb24':
docs: google market -> google play
2012-11-01 14:23:30 -07:00
Robert Ly
93a9a0a2bc
am 0fc15da0: am 677c1e14: Merge "docs: google market -> google play" into jb-dev-docs
...
* commit '0fc15da00597c5a017c1d8eed8f34064c702e4c2':
docs: google market -> google play
2012-11-01 14:19:18 -07:00
Robert Ly
0fc15da005
am 677c1e14: Merge "docs: google market -> google play" into jb-dev-docs
...
* commit '677c1e14fbd991a46b5496d0873b7ca155fd71fb':
docs: google market -> google play
2012-11-01 14:16:47 -07:00
Robert Ly
677c1e14fb
Merge "docs: google market -> google play" into jb-dev-docs
2012-11-01 14:14:26 -07:00
Joe Malin
af4b423e1a
am 53ed134c: am 48464f15: am 1f177cb8: am e639d67a: am d2e16346: am ac294abb: Revision to Notifications API guide
...
* commit '53ed134cdabf8f9c943e3b54ab38bc12ab5ff279':
Revision to Notifications API guide
2012-11-01 14:11:53 -07:00
Joe Malin
1f177cb87a
am e639d67a: am d2e16346: am ac294abb: Revision to Notifications API guide
...
* commit 'e639d67aeb0e2758f2480c25e8ab007918701ed3':
Revision to Notifications API guide
2012-11-01 14:00:54 -07:00
Joe Malin
e639d67aeb
am d2e16346: am ac294abb: Revision to Notifications API guide
...
* commit 'd2e163461ee8aa79d4560f38e924a7edc44ad4dd':
Revision to Notifications API guide
2012-11-01 13:58:02 -07:00
Joe Malin
d2e163461e
am ac294abb: Revision to Notifications API guide
...
* commit 'ac294abb40483fc734e22833371d95cbb161ec87':
Revision to Notifications API guide
2012-11-01 13:55:08 -07:00
Joe Malin
ac294abb40
Revision to Notifications API guide
...
Change-Id: I52229dfdff3649e03a1fbce91234c8b2a544502a
2012-11-01 12:57:58 -07:00
Scott Main
22d17c984a
docs: misc changes for new manifest attributes,
...
including fix for bug 7443821
bug 7442263
Change-Id: I20b712bf2b0379c70ff28682025d6f30817a6c36
2012-11-01 10:39:41 -07:00
&& repo sync -j8
eb1e7eac9f
Doc change: GCM category & dry_run params
...
Bug # 7171849
Change-Id: Ifde95a058fc90b777faf3d43d34a72b048e20126
2012-10-22 13:57:14 -07:00
Scott Main
921db4daeb
am ae19acd4: am d4161658: am e9b533bf: am 82f0ba79: am 4a6b6948: am 07322102: revise code sample for callback interface
...
* commit 'ae19acd489d7a12235c09fa13e6355328699f7ea':
revise code sample for callback interface
2012-10-18 12:39:28 -07:00
Scott Main
e9b533bff0
am 82f0ba79: am 4a6b6948: am 07322102: revise code sample for callback interface
...
* commit '82f0ba79e67c154fc12a6cfde2fe1205da166b0d':
revise code sample for callback interface
2012-10-18 12:31:05 -07:00
Scott Main
82f0ba79e6
am 4a6b6948: am 07322102: revise code sample for callback interface
...
* commit '4a6b69488f9fd90bbe04a930ffad8999bc93e173':
revise code sample for callback interface
2012-10-18 12:25:19 -07:00
Scott Main
4a6b69488f
am 07322102: revise code sample for callback interface
...
* commit '07322102e5f1877bc2860d2c72eeeb41839d6bea':
revise code sample for callback interface
2012-10-18 12:18:31 -07:00
Scott Main
07322102e5
revise code sample for callback interface
...
Change-Id: I8e27e2579dcc5cb84a71c74769fb89bb639e16ba
2012-10-17 15:40:53 -07:00
Robert Ly
dd5c182ad9
docs: google market -> google play
...
Change-Id: I546a0c07920612a3fa31a2507c934a28c4d9f419
2012-10-17 11:50:40 -07:00
Scott Main
cdfc1dad89
am 05dbd903: am 4975af77: am 6b77a76d: am 5dc7ac74: am a7b56a20: am e249763d: small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications
...
* commit '05dbd903d0ee830140a0fb3290eaac47a505a760':
small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications
2012-10-12 14:23:34 -07:00
Scott Main
6b77a76d3f
am 5dc7ac74: am a7b56a20: am e249763d: small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications
...
* commit '5dc7ac745300fb043267a0c9235244a115507c51':
small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications
2012-10-12 14:17:03 -07:00
Scott Main
5dc7ac7453
am a7b56a20: am e249763d: small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications
...
* commit 'a7b56a20ec80699371359cdd6f459a7eaec67185':
small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications
2012-10-12 14:14:46 -07:00
Scott Main
a7b56a20ec
am e249763d: small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications
...
* commit 'e249763db18bb445e93f493046946c13185aa09d':
small update to Toast guide, flatten sidenav for notifications/toasts, new screenshots for notifications
2012-10-12 14:12:07 -07:00
Scott Main
e249763db1
small update to Toast guide, flatten sidenav for notifications/toasts,
...
new screenshots for notifications
Change-Id: I0c02e9e6db70a60ca299ff7f0caa7c8276b7ab68
2012-10-12 12:06:10 -07:00
Joe Malin
260d1f2748
am bbbb1298: am 289eb791: am 87afd6eb: am 54a1e4d4: am 5832d1ce: am 01154bda: DOC CHANGE: Notifications Guide
...
* commit 'bbbb1298e329d24ff6ee52ac82b65d8ceaa4dfc2':
DOC CHANGE: Notifications Guide
2012-10-12 11:09:35 -07:00
Joe Malin
87afd6eb4b
am 54a1e4d4: am 5832d1ce: am 01154bda: DOC CHANGE: Notifications Guide
...
* commit '54a1e4d4c4216af987c7b769723cd2e59ca2c233':
DOC CHANGE: Notifications Guide
2012-10-11 17:42:46 -07:00
Joe Malin
54a1e4d4c4
am 5832d1ce: am 01154bda: DOC CHANGE: Notifications Guide
...
* commit '5832d1ce7240c056a1e85a49549635b60711a5c6':
DOC CHANGE: Notifications Guide
2012-10-11 17:40:46 -07:00
Joe Malin
5832d1ce72
am 01154bda: DOC CHANGE: Notifications Guide
...
* commit '01154bdae9d6f3d1fbed3169ffa194d51045c9cf':
DOC CHANGE: Notifications Guide
2012-10-11 17:38:46 -07:00
Joe Malin
01154bdae9
DOC CHANGE: Notifications Guide
...
Change-Id: I7968e933b0fdc5b1de1aa24acbad4f65f183ca42
2012-10-11 16:55:12 -07:00
Katie McCormick
a5259759eb
am ef0eaa5e: am ed6059a2: am 1dbce5f1: am 05ab277c: am fa4865f6: resolved conflicts for merge of 0b479e43 to jb-dev
...
* commit 'ef0eaa5e661d9eb21974c290a121b35fc78b8bcb':
Doc changes: misc GCM updates.
2012-10-10 17:22:50 -07:00
Katie McCormick
1dbce5f1e5
am 05ab277c: am fa4865f6: resolved conflicts for merge of 0b479e43 to jb-dev
...
* commit '05ab277c21731ab11333c56d7d2266b9b1c4d46d':
Doc changes: misc GCM updates.
2012-10-10 16:09:41 -07:00
Katie McCormick
05ab277c21
am fa4865f6: resolved conflicts for merge of 0b479e43 to jb-dev
...
* commit 'fa4865f680cc151ff051b7a82fb0e94145d70377':
Doc changes: misc GCM updates.
2012-10-10 16:06:19 -07:00
Katie McCormick
fa4865f680
resolved conflicts for merge of 0b479e43 to jb-dev
...
Change-Id: I04bc45425f11b3562a4219719716c55eaff2228e
2012-10-10 11:09:03 -07:00
&& repo sync -j8
0b479e4379
Merge "Doc changes: misc GCM updates." into jb-dev-docs
2012-10-10 10:34:48 -07:00
&& repo sync -j8
4fd6c20b17
Doc changes: misc GCM updates.
...
Change-Id: I12e7ae6c4b52b8aa54dc355d09916c3b4499f172
2012-10-09 14:30:41 -07:00
Robert Ly
4cabdf20aa
am fb9d598d: am 261ba620: am 0f31450f: am fba8b7f5: am f19e4b42: Merge "docs: nfc ndef helper methods bug 5957772" into jb-dev
...
* commit 'fb9d598d9e95a9d3e0be8e1dee81ebb0986aee8e':
docs: nfc ndef helper methods bug 5957772
2012-10-09 11:49:38 -07:00
Robert Ly
0f31450fe0
am fba8b7f5: am f19e4b42: Merge "docs: nfc ndef helper methods bug 5957772" into jb-dev
...
* commit 'fba8b7f5963cb2bc15f06d83d986345978cc415e':
docs: nfc ndef helper methods bug 5957772
2012-10-09 11:42:14 -07:00
Robert Ly
fba8b7f596
am f19e4b42: Merge "docs: nfc ndef helper methods bug 5957772" into jb-dev
...
* commit 'f19e4b420de65306f09c199829e7e06fe210e21d':
docs: nfc ndef helper methods bug 5957772
2012-10-09 11:40:34 -07:00
Robert Ly
f19e4b420d
Merge "docs: nfc ndef helper methods bug 5957772" into jb-dev
2012-10-09 11:38:00 -07:00
Dirk Dougherty
6429798125
am 957c30ca: am b0a8b0b8: am 3b9e7f32: am fb554fc0: am b049b1ef: am 46c4b488: Doc change: Subscriptions free trials on Google Play.
...
* commit '957c30ca730f4c6d27b7563e20f08421bda7ea80':
Doc change: Subscriptions free trials on Google Play.
2012-10-09 10:45:30 -07:00