Joe Fernandez
6a050e96c7
am 0fac4f27: am 9881c0d8: am c97bc213: am f21746fc: Merge "docs: update location of sample apps" into lmp-dev
...
* commit '0fac4f27c762058b5b955749e8be68ae8573a8e8':
docs: update location of sample apps
2014-10-17 20:29:01 +00:00
Dirk Dougherty
94ce09cb80
am e1fa68cd: am 20a7afd4: am f0c1af8e: am 22fa76da: Merge "Doc change: Add Lollipop to platform versions table." into lmp-dev
...
* commit 'e1fa68cd24c5a97a549c101f3eeacb70cafb8c9d':
Doc change: Add Lollipop to platform versions table.
2014-10-17 19:11:31 +00:00
Scott Rowe
0e500adfc8
am 81584ee6: am 5100b72c: am fafb6c70: am dd886683: docs: Notifications changes for L
...
* commit '81584ee6ed1b0378847aaee0ae4091cb9fefe2a3':
docs: Notifications changes for L
2014-10-17 19:10:38 +00:00
Joe Fernandez
8733556213
am d81ca1da: am 39f69b79: am 770f57e0: am 321e7645: Merge "docs: Recents screen for tasks and activities" into lmp-dev
...
* commit 'd81ca1da0546b4d0d9ff32918132e625e89d4e16':
docs: Recents screen for tasks and activities
2014-10-17 19:10:23 +00:00
Joe Fernandez
bc31db59e5
am 315a45e0: am 36d13e6a: am 491fa057: am d664dc93: Merge "Android 5.0 changes to IME switching" into lmp-dev
...
* commit '315a45e085a14884e267c49498e94a316376e212':
Android 5.0 changes to IME switching
2014-10-17 19:09:52 +00:00
Scott Rowe
87b1d0d099
docs: update location of sample apps
...
Change-Id: I5079d5578c29cde387d087ec8767ae03aaa7ebe2
2014-10-17 10:46:04 -07:00
Dirk Dougherty
2b86948e46
Doc change: Add Lollipop to platform versions table.
...
Change-Id: Iad84444396a3b2d24403e88398ca21933741b819
2014-10-17 02:16:58 -07:00
Scott Rowe
dd88668392
docs: Notifications changes for L
...
Change-Id: I53c744734358401adefbcffd5ce5a3676d6d955a
2014-10-16 23:48:25 -07:00
Joe Fernandez
321e7645c3
Merge "docs: Recents screen for tasks and activities" into lmp-dev
2014-10-17 05:40:43 +00:00
Scott Rowe
73d799dda2
docs: Recents screen for tasks and activities
...
Change-Id: I94774e60e6a7453a047ad394c3bbfff0cc4dfc7d
2014-10-16 22:16:13 -07:00
Joe Fernandez
d664dc93f4
Merge "Android 5.0 changes to IME switching" into lmp-dev
2014-10-17 05:01:04 +00:00
David Friedman
e802d5432e
Android 5.0 changes to IME switching
...
Change-Id: I158736ee36706889a5277f02a652162194289514
2014-10-16 21:52:53 -07:00
Scott Rowe
6b7bca2cbb
am d534cf04: am 0e328222: am c9f6bb8e: am 447369f2: am a1e3063e: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs
...
* commit 'd534cf04f014096e23fa533614a25eafeaafb771':
docs: update reference to FragmentRetainInstance
2014-10-16 19:17:06 +00:00
David Friedman
bc6c216540
am 57c63dbf: am b0683f0c: am d12e6de6: Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev automerge: f8e428d
...
* commit '57c63dbf271ebc66c9ce09eaac05b1d1f524944e':
OpenGL 3.1 and AEP documentation for L-release.
2014-10-16 19:16:25 +00:00
Scott Rowe
447369f2d2
am a1e3063e: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs
...
* commit 'a1e3063ebe04c8c304f48a02117085962f75cb63':
docs: update reference to FragmentRetainInstance
2014-10-16 18:23:42 +00:00
David Friedman
d12e6de645
Merge "OpenGL 3.1 and AEP documentation for L-release." into lmp-dev
2014-10-16 18:06:01 +00:00
Scott Rowe
ab64919c0e
Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs
2014-10-16 16:56:55 +00:00
David Friedman
778d3552d6
OpenGL 3.1 and AEP documentation for L-release.
...
Change-Id: I21b75a6f38977729fa8c1c94c66354054bdb780c
2014-10-15 19:59:43 -07:00
Nick Kralevich
a26487cb28
am 55bb6a7b: am 01edf579: am fce896fe: am 0ae82b05: resolved conflicts for merge of a4eb81b6 to lmp-dev
...
* commit '55bb6a7b68595ee83b543eda40d191636de1831e':
Docs: adding closing bracket to un-break javadoc tokens.
2014-10-15 02:03:37 +00:00
Nick Kralevich
0ae82b05be
resolved conflicts for merge of a4eb81b6 to lmp-dev
...
Change-Id: I73b225141e09826b40e4941140b59d1c163bd9c7
2014-10-14 08:38:05 -07:00
Eric Gilmore
e77fe60760
Docs: adding closing bracket to un-break javadoc tokens.
...
Bug: 17186958
Change-Id: Ib21120d71ccd7c59536af3d26d7090fc919bec17
2014-10-09 10:17:59 -07:00
Ricardo Cervera
abbbc5940a
am ef081faf: am 25221488: am 3edec8ec: am dbcfc8ef: am a18075e8: am bd964cad: docs: Removing references to self note on Common Intents page.
...
* commit 'ef081faf72931b9c8262bcd8d4c387b615218857':
docs: Removing references to self note on Common Intents page.
2014-10-08 07:51:33 +00:00
Ricardo Cervera
dcc6501c73
am 24e579a2: am 614ae244: am d3ffa845: am 692bb81c: am 6d30f576: am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs
...
* commit '24e579a2d387b2c4307a016982d8ee85b32693a7':
docs: Update Common Intents page with Google Now actions
2014-10-08 07:51:29 +00:00
Ricardo Cervera
dbcfc8efdb
am a18075e8: am bd964cad: docs: Removing references to self note on Common Intents page.
...
* commit 'a18075e82b603762382232816c0d74abcc7e46e7':
docs: Removing references to self note on Common Intents page.
2014-10-07 23:49:06 +00:00
Ricardo Cervera
692bb81c12
am 6d30f576: am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs
...
* commit '6d30f576146725ee81b8cb753584985a2758b566':
docs: Update Common Intents page with Google Now actions
2014-10-07 23:48:48 +00:00
Ricardo Cervera
bd964cadd4
docs: Removing references to self note on Common Intents page.
...
Change-Id: Ia1324f2363ce66ad0019946605a6a74a4cd28ecc
2014-10-07 10:37:19 -07:00
Ricardo Cervera
cee4ed8a1d
docs: Update Common Intents page with Google Now actions
...
Change-Id: I474539d37791b16df693193bcdaee4e2161a2612
2014-10-06 19:16:06 -07:00
Newton Allen
df2b8a1cb9
am 58f75627: am 94f5155d: am c68aad9f: am d84ce32b: Merge "Fix some documentation typos." into lmp-dev
...
* commit '58f75627d195082e263f6d6d8e3c46c6d0970e63':
Fix some documentation typos.
2014-10-02 19:43:39 +00:00
Newton Allen
8f8a11b7fa
Fix some documentation typos.
...
Change-Id: I747a0ade5c7b9c45d4465bf327952338bbc1cfaa
(cherry picked from commit 4465d1a03e
2014-09-30 02:52:26 +00:00
Elliott Hughes
4656e69bf3
resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aosp
...
Change-Id: I5148eda624e8504f12dbc1288cd4a7a5b7c10850
2014-09-08 13:08:43 -07:00
Mark Doliner
d0646dca40
Small documentation fixes across many files.
...
Change-Id: I3e8787ce4bc6018ea1dc9aef2a2cd4e0a8dde663
2014-09-05 13:57:51 -07:00
Scott Rowe
3215da25dd
am 14f413be: am 048d8baa: am 0ccf80c3: Merge "docs: b/15790433 updated for xxhdpi and xxxhdpi" into klp-modular-docs
...
* commit '14f413be3c7701750b996b90c95471e8cf04ae96':
docs: b/15790433 updated for xxhdpi and xxxhdpi
2014-09-04 00:20:15 +00:00
Scott Rowe
14f413be3c
am 048d8baa: am 0ccf80c3: Merge "docs: b/15790433 updated for xxhdpi and xxxhdpi" into klp-modular-docs
...
* commit '048d8baaffadc28ee8e7bab0ce61a868c09c311a':
docs: b/15790433 updated for xxhdpi and xxxhdpi
2014-09-04 00:13:02 +00:00
Scott Rowe
0ccf80c31d
Merge "docs: b/15790433 updated for xxhdpi and xxxhdpi" into klp-modular-docs
2014-09-03 23:52:13 +00:00
Joe Fernandez
14a5d2bd4d
am a1a3c8a1: am 9de22952: am ab833be6: Merge "docs: Fix bug with Accessibility Services dev guide" into klp-modular-docs
...
* commit 'a1a3c8a126032596b722d9faa74c616a4a8974e7':
docs: Fix bug with Accessibility Services dev guide
2014-09-03 23:36:30 +00:00
Joe Fernandez
a1a3c8a126
am 9de22952: am ab833be6: Merge "docs: Fix bug with Accessibility Services dev guide" into klp-modular-docs
...
* commit '9de229527e710a90b03a415a9b752cc6e2a11592':
docs: Fix bug with Accessibility Services dev guide
2014-09-03 23:29:46 +00:00
Joe Fernandez
ab833be68e
Merge "docs: Fix bug with Accessibility Services dev guide" into klp-modular-docs
2014-09-03 23:12:20 +00:00
Joe Fernandez
5632984369
docs: Fix bug with Accessibility Services dev guide
...
b/11448573
Change-Id: I778c26f86c4a2cb3ebef9f3e75b5d544269486dc
2014-08-29 16:44:18 -07:00
Scott Rowe
0ae64a84af
am 4d50fde5: am 6208e7b5: am 1014b9aa: Merge "docs: remove references to resource browser; point to SDK instead" into klp-modular-docs
...
* commit '4d50fde5754b2f4a8350b79b42812100183175a4':
docs: remove references to resource browser; point to SDK instead
2014-08-29 21:33:11 +00:00
Scott Rowe
4d50fde575
am 6208e7b5: am 1014b9aa: Merge "docs: remove references to resource browser; point to SDK instead" into klp-modular-docs
...
* commit '6208e7b56080956ffc48ade8d0b0f038b901cb23':
docs: remove references to resource browser; point to SDK instead
2014-08-29 21:17:08 +00:00
Scott Rowe
1014b9aa49
Merge "docs: remove references to resource browser; point to SDK instead" into klp-modular-docs
2014-08-29 20:52:54 +00:00
Tim Murray
29d35997a3
am cb16b55b: am 2a866f07: Update RenderScript docs.
...
* commit 'cb16b55b5ed9e4388b36e457226c96962004dd6c':
Update RenderScript docs.
2014-08-26 17:51:21 +00:00
Tim Murray
2a866f075d
Update RenderScript docs.
...
android.renderscript is *not* deprecated at all and continues to
be under heavy development.
Change-Id: Ia5fcfbe89d30e92b97439c2864fd67de32b81fa4
(cherry picked from commit 0a02f29ad12845cfbda95c463c12d583f668ba63)
2014-08-25 22:36:17 +00:00
Tim Murray
1df3f99d2d
Merge "Update RenderScript docs." into lmp-dev
2014-08-25 22:35:58 +00:00
Tim Murray
e87234f3ba
Update RenderScript docs.
...
android.renderscript is *not* deprecated at all and continues to
be under heavy development.
Change-Id: Ia5fcfbe89d30e92b97439c2864fd67de32b81fa4
2014-08-25 11:08:24 -07:00
Ricardo Cervera
e5d7411744
am c1da9cbf: am 2c374e64: am 82957e38: Merge "docs: Fixed typo in intents page. Bug: 16949177" into klp-modular-docs
...
* commit 'c1da9cbff5d5b597fd58cbb578a1eadc6f479c80':
docs: Fixed typo in intents page. Bug: 16949177
2014-08-21 17:44:53 +00:00
Ricardo Cervera
866ae385dd
am e4be8986: am 0d65bf25: am 262b4147: Merge "docs: Fixed bug in declaring layout page. Bug: 16815916" into klp-modular-docs
...
* commit 'e4be8986544a45a2560003f004b72528c691acef':
docs: Fixed bug in declaring layout page. Bug: 16815916
2014-08-21 17:44:40 +00:00
Ricardo Cervera
c1da9cbff5
am 2c374e64: am 82957e38: Merge "docs: Fixed typo in intents page. Bug: 16949177" into klp-modular-docs
...
* commit '2c374e643d6cce73a71fb57559f898b6b554e36c':
docs: Fixed typo in intents page. Bug: 16949177
2014-08-21 17:31:31 +00:00
Ricardo Cervera
e4be898654
am 0d65bf25: am 262b4147: Merge "docs: Fixed bug in declaring layout page. Bug: 16815916" into klp-modular-docs
...
* commit '0d65bf25c8a9091d598f50e0d534625107db6cf6':
docs: Fixed bug in declaring layout page. Bug: 16815916
2014-08-21 17:31:03 +00:00
Ricardo Cervera
82957e38b2
Merge "docs: Fixed typo in intents page. Bug: 16949177" into klp-modular-docs
2014-08-21 15:22:11 +00:00
