drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
88,988 Commits 1 Branch 0 Tags
Commit Graph

88988 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
34434badf6 Doc change: Edits for RTL in highlights. 
Change-Id: I4a01bbcaa1470dce571295a9e5e035a395c28c1a
 2013-02-15 15:00:43 -08:00
Dirk Dougherty
9a93e07979 am f857c51d: Doc change: add notice for iab v3 subscriptions launch. 
# Via Dirk Dougherty
* commit 'f857c51d77d2199cfb3351e0e1c93a55e8564dc4':
  Doc change: add notice for iab v3 subscriptions launch.
 2013-02-14 12:03:35 -08:00
Dirk Dougherty
f857c51d77 Doc change: add notice for iab v3 subscriptions launch. 
Change-Id: I3b1365cee219ab7fb8ac27cf333609986a947b3c
 2013-02-14 11:47:36 -08:00
quddusc
62bd23190b am 38b6d7a1: Merge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb-mr1-dev 
# Via Android (Google) Code Review (1) and quddusc (1)
* commit '38b6d7a15c6d5196f9b886f15dc58c28734300da':
  docs: Updated In-app Billing docs to support subscriptions for V3.
 2013-02-13 17:12:40 -08:00
quddusc
38b6d7a15c Merge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb-mr1-dev 2013-02-14 01:09:27 +00:00
quddusc
8dcc99dd82 docs: Updated In-app Billing docs to support subscriptions for V3. 
Change-Id: If56d563249c6836245e9d3dc2d0f7d709de0bd29
 2013-02-13 16:45:41 -08:00
Joe Fernandez
6978d04b44 am 9d95873d: Merge "docs: SDK r21.1 - fix download links, Issue 8193979" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Joe Fernandez (1)
* commit '9d95873de1bdb024bcf50a51c5a6606a645f9d5d':
  docs: SDK r21.1 - fix download links, Issue 8193979
 2013-02-13 15:27:09 -08:00
Joe Fernandez
9d95873de1 Merge "docs: SDK r21.1 - fix download links, Issue 8193979" into jb-mr1-dev 2013-02-13 23:24:10 +00:00
Scott Main
c660821502 am d51a894a: docs: fix tools sidenav for offline docs 
# Via Scott Main
* commit 'd51a894a50b6dd48023fdc5b79c6f889a3988903':
  docs: fix tools sidenav for offline docs
 2013-02-13 15:11:19 -08:00
Scott Main
d51a894a50 docs: fix tools sidenav for offline docs 
Change-Id: If15ec25f395d9e18f35085488b75be8f84a6d42f
 2013-02-13 15:06:41 -08:00
Joe Fernandez
b80012e35c docs: SDK r21.1 - fix download links, Issue 8193979 
Change-Id: Iabbbb030d50390021feab478812140158cdfd104
 2013-02-13 14:51:59 -08:00
Scott Main
be4d1dcd01 am dd8b5845: Merge "docs: add info about secure adb" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Scott Main (1)
* commit 'dd8b58457c6ce18ec98f1b2419300aa8c9cd326d':
  docs: add info about secure adb
 2013-02-13 10:05:41 -08:00
Scott Main
dd8b58457c Merge "docs: add info about secure adb" into jb-mr1-dev 2013-02-13 18:01:48 +00:00
Joe Fernandez
30890f2853 am c5cb262c: Merge "docs: Keystore/Cert warning for Signing Apps, Issue: 8180111" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Joe Fernandez (1)
* commit 'c5cb262cc6bd47a5a2ad71866cb6d9961713842a':
  docs: Keystore/Cert warning for Signing Apps, Issue: 8180111
 2013-02-13 09:38:54 -08:00
Joe Fernandez
c5cb262cc6 Merge "docs: Keystore/Cert warning for Signing Apps, Issue: 8180111" into jb-mr1-dev 2013-02-13 17:35:22 +00:00
Joe Fernandez
798da53fa8 docs: Keystore/Cert warning for Signing Apps, Issue: 8180111 
Change-Id: Iab2a06fc27922aafbf10b821550098c040e2a4b2
 2013-02-13 09:26:57 -08:00
Joe Fernandez
7bb37c8748 am 0480d5d8: Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Joe Fernandez (1)
* commit '0480d5d88c95abebb073dc1ea5a2f20d5ffdef38':
  docs: Android SDK 21.1.0 Release Notes
 2013-02-13 07:14:10 -08:00
Joe Fernandez
0480d5d88c Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev 2013-02-13 15:10:16 +00:00
Scott Main
b861a9455c am 4cb43d97: Merge "lists.js files for gms and gcm" into jb-mr1-dev 
# By Robert Ly
# Via Android (Google) Code Review (1) and Robert Ly (1)
* commit '4cb43d977bb610fc8e2789dc53334569f2aa55e8':
  lists.js files for gms and gcm
 2013-02-12 18:27:57 -08:00
Scott Main
4cb43d977b Merge "lists.js files for gms and gcm" into jb-mr1-dev 2013-02-13 02:24:57 +00:00
Robert Ly
373264b776 lists.js files for gms and gcm 
Change-Id: I786adfc966986a8e71dc2164740f2a00d60c0159
 2013-02-12 18:15:04 -08:00
Xavier Ducrohet
f70b8c1ceb Merge "Fix DateFormat for layoutlib." into jb-mr1.1-dev 2013-02-12 23:44:57 +00:00
Scott Main
03c54e77d4 docs: add info about secure adb 
Change-Id: I6edf5bf20bce328c1e4cb2ec33f01a1439e2dbfa
 2013-02-12 14:47:17 -08:00
Xavier Ducrohet
47a021f764 Fix DateFormat for layoutlib. 
Change-Id: I389c9d106b93b9f81dd3614398a5b66ba2b39a70
 2013-02-12 14:05:32 -08:00
Robert Ly
2328a77980 am 9eb66b2d: Merge "Revert "makefile changes for gcm javadocs"" into jb-mr1-dev 
# Via Android (Google) Code Review
* commit '9eb66b2db4724da7a2d6575fee29840004f1a5df':
  Revert "makefile changes for gcm javadocs"
 2013-02-12 13:49:44 -08:00
Robert Ly
9eb66b2db4 Merge "Revert "makefile changes for gcm javadocs"" into jb-mr1-dev 2013-02-12 21:46:07 +00:00
Robert Ly
d3b50de375 Revert "makefile changes for gcm javadocs" 
This reverts commit 5f9922d7c3bce158e4c7a58929d4075e7c91e32e

Change-Id: I310f27b231c6d64d6d407ae451b189a6ecf6b34f
 2013-02-12 21:39:28 +00:00
Robert Ly
a95a64ddd6 am dc8ee206: Merge "Revert "makefile changes for s.a.c"" into jb-mr1-dev 
# Via Android (Google) Code Review
* commit 'dc8ee2066a45adc6a57157c550e65317c8650ca0':
  Revert "makefile changes for s.a.c"
 2013-02-12 10:41:20 -08:00
Robert Ly
dc8ee2066a Merge "Revert "makefile changes for s.a.c"" into jb-mr1-dev 2013-02-12 18:37:51 +00:00
Robert Ly
343a89c2cd Revert "makefile changes for s.a.c" 
This reverts commit 4c01047ec7b06aabeeae273c7871caa6c3029b84

Change-Id: I4465cfa678717ff7c202347ae6ad36d12d5393bc
 2013-02-12 18:29:10 +00:00
Scott Main
7209135504 am bfec2a01: docs: nudge dashboard chart to the right to avoid overlap 
# Via Scott Main
* commit 'bfec2a01896959ba2bc9a995238eb31644ea8dc6':
  docs: nudge dashboard chart to the right to avoid overlap
 2013-02-11 16:52:51 -08:00
Scott Main
bfec2a0189 docs: nudge dashboard chart to the right to avoid overlap 
Change-Id: I852004b6dbd7ca8343a20f05da1166cff2d2898a
 2013-02-11 14:24:03 -08:00
Robert Ly
96b1b403b6 am 4c01047e: makefile changes for s.a.c 
# Via Robert Ly
* commit '4c01047ec7b06aabeeae273c7871caa6c3029b84':
  makefile changes for s.a.c
 2013-02-11 14:10:00 -08:00
Robert Ly
4c01047ec7 makefile changes for s.a.c 
Change-Id: I501cc140994b2822c3df1f00639076f17765f256
 2013-02-11 13:38:31 -08:00
Dirk Dougherty
337d3e3240 am 7d849491: Doc change: fix typos. 
# Via Dirk Dougherty
* commit '7d8494913292dcdbe25d046cbef6e349d904b41c':
  Doc change: fix typos.
 2013-02-11 11:23:28 -08:00
Dirk Dougherty
7d84949132 Doc change: fix typos. 
Change-Id: I58c8841c9bf23bc75e1b25d63af917ff56087fdc
 2013-02-11 11:18:59 -08:00
Joe Fernandez
46e31ae425 docs: Android SDK 21.1.0 Release Notes 
Change-Id: I1e97eb5a7e3b4a1c63474f7b85cb22dd343ceb4b
 2013-02-08 14:28:02 -08:00
Dirk Dougherty
f2d89ef9d5 am 64ab8fdc: Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Dirk Dougherty (1)
* commit '64ab8fdcb0a3015d3e6c4db0a1d66443085fd673':
  Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning.
 2013-02-08 11:14:23 -08:00
Dirk Dougherty
64ab8fdcb0 Merge "Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning." into jb-mr1-dev 2013-02-08 19:10:07 +00:00
Robert Ly
9da9a7cda2 am e60b6023: Merge "makefile changes for gcm javadocs" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Robert Ly (1)
* commit 'e60b6023ae4fdea932d0effc553dddc38117d235':
  makefile changes for gcm javadocs
 2013-02-07 17:53:29 -08:00
Robert Ly
e60b6023ae Merge "makefile changes for gcm javadocs" into jb-mr1-dev 2013-02-08 01:48:56 +00:00
Dirk Dougherty
34c880415b Doc change: remove protocol scheme on dashboard src url to avoid mixed content warning. 
Change-Id: I3003fa163f7c9e10925d96f8d89005b42baed315
 2013-02-07 17:32:35 -08:00
Katie McCormick
b68702eb05 am 0e66f16a: Merge "Doc change: Scroller Javadoc Bug # 7966653" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Katie McCormick (1)
* commit '0e66f16abd651bdf5833f4aede4899e627d7b333':
  Doc change: Scroller Javadoc Bug # 7966653
 2013-02-07 17:18:48 -08:00
Katie McCormick
0e66f16abd Merge "Doc change: Scroller Javadoc Bug # 7966653" into jb-mr1-dev 2013-02-08 01:14:47 +00:00
Katie McCormick
87cfad7d74 Doc change: Scroller Javadoc Bug # 7966653 
Change-Id: I4365946f890a76fcfa78ca9d69f2a8e0848095a9
 2013-02-07 16:42:26 -08:00
Katie McCormick
ef4196d0ec am 89fafaea: Doc update: clean up 
# Via Katie McCormick
* commit '89fafaeae73cc265f13775944ccb2841bbc6766c':
  Doc update: clean up
 2013-02-07 15:49:36 -08:00
Katie McCormick
89fafaeae7 Doc update: clean up 
Change-Id: Idd11b36d54e01671d45764dd6ed327621a3fa682
 2013-02-07 14:23:14 -08:00
Robert Ly
5f9922d7c3 makefile changes for gcm javadocs 
Change-Id: I5653eb710f13f0a097cb1cf447469c4da7342fe2
 2013-02-07 11:08:44 -08:00
Scott Main
805d2e2d98 am 00f49084: Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev 
# Via Android (Google) Code Review (1) and Scott Main (1)
* commit '00f490844d89b146e5490204a5a483834950c489':
  docs: fix renderscript links that currently require redirect
 2013-02-06 12:19:30 -08:00
Scott Main
00f490844d Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev 2013-02-06 20:14:49 +00:00