summaryrefslogtreecommitdiffstats
path: root/docs
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Document that WebView doesn't honor "uses cleartext traffic" flag."Alex Klyubin2015-04-211-6/+7
|\
| * Document that WebView doesn't honor "uses cleartext traffic" flag.Alex Klyubin2015-04-211-6/+7
| | | | | | | | | | Bug: 19215516 Change-Id: I5dbbaa03f3cae007c0b9b68fcf8cc8f250c16a62
* | am 2da31b1e: am 886e8e11: am 2fdd83a9: am d2545775: am 4c20df0b: am ↵Luan Nguyen2015-04-211-0/+24
|\ \ | | | | | | | | | | | | | | | | | | 4aebbfbb: Merge "docs: Add Channel API summary for Wear." into lmp-docs * commit '2da31b1ef75f239ee33fea4592cbf0159a0af8b4': docs: Add Channel API summary for Wear.
| * \ am 2fdd83a9: am d2545775: am 4c20df0b: am 4aebbfbb: Merge "docs: Add Channel ↵Luan Nguyen2015-04-211-0/+24
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | API summary for Wear." into lmp-docs * commit '2fdd83a97a0dd3de36264928ff42dcc0a098018f': docs: Add Channel API summary for Wear.
| | * \ Merge "docs: Add Channel API summary for Wear." into lmp-docsLuan Nguyen2015-04-211-0/+24
| | |\ \
| | | * | docs: Add Channel API summary for Wear.Luan Nguyen2015-04-171-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | bug: 20089257 Change-Id: I447e58264e142a5e04aaf520d31dc4ced2506ecb
* | | | | am 3b6883b8: am 8cde8f7f: am b1c838e0: am 6f142008: am 220f360e: am ↵Quddus Chong2015-04-20168-4074/+57221
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | | | | | | | | 900831f3: docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402 * commit '3b6883b8054ffad5b3cc845552d09bfe673cb889': docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402
| * | | am b1c838e0: am 6f142008: am 220f360e: am 900831f3: docs: Added 3rd-party ↵Quddus Chong2015-04-20168-4074/+57221
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Javadocs for Android Support Testing Library v0.2. bug: 20304402 * commit 'b1c838e03bf9f828e59deed57a7e7445cc2ad9e8': docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2. bug: 20304402
| | * | docs: Added 3rd-party Javadocs for Android Support Testing Library v0.2.Quddus Chong2015-04-20168-4074/+57221
| | | | | | | | | | | | | | | | | | | | | | | | bug: 20304402 Change-Id: I0fab71be55f5c3c6d017ba585b92f8493050274a
* | | | am b84f4cfe: am fea08ccd: am 3d1a37e9: am 38d969c5: am 558907f7: am ↵Ryosuke Matsuuchi2015-04-193-0/+203
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | 0d2f2803: Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docs * commit 'b84f4cfe5d09ea55900bd8ea3b68970a998a244f': doc: Add Korean version of DAC/distribute/ page.
| * | | am 3d1a37e9: am 38d969c5: am 558907f7: am 0d2f2803: Merge "doc: Add Korean ↵Ryosuke Matsuuchi2015-04-193-0/+203
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | version of DAC/distribute/ page." into lmp-docs * commit '3d1a37e9ecffd89f61de27d924b0469a6a09ea8c': doc: Add Korean version of DAC/distribute/ page.
| | * | Merge "doc: Add Korean version of DAC/distribute/ page." into lmp-docsRyosuke Matsuuchi2015-04-193-0/+203
| | |\ \
| | | * | doc: Add Korean version of DAC/distribute/ page.Ryosuke Matsuuchi2015-04-173-0/+203
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20204101 Change-Id: I5a4795dd03ca4f904c26ce6138eb98d085dd3deb
* | | | | am 93e73639: am 308cd160: am 488e5bbc: am 1696552f: am 6e141199: am ↵Dirk Dougherty2015-04-192-17/+23
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | ff233af7: Merge "Doc change: distribute landing page." into lmp-docs * commit '93e73639bf0e1cea63c0c0eee24f4be2aba5fb0f': Doc change: distribute landing page.
| * | | | am 488e5bbc: am 1696552f: am 6e141199: am ff233af7: Merge "Doc change: ↵Dirk Dougherty2015-04-182-17/+23
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | distribute landing page." into lmp-docs * commit '488e5bbc2333adb1c84be90b797e1a8d36d070c3': Doc change: distribute landing page.
| | * | | Merge "Doc change: distribute landing page." into lmp-docsDirk Dougherty2015-04-182-17/+23
| | |\ \ \
| | | * | | Doc change: distribute landing page.Dirk Dougherty2015-04-182-17/+23
| | | |/ / | | | | | | | | | | | | | | | Change-Id: I7442760c79d2037c9ee51f52ebd15d8373b7e1be
* | | | | am fea8ddd4: am a9315dc1: am c1002dfc: am 71a616e0: am 203a4739: am ↵Rich Slogar2015-04-175-28/+12
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | 1fcc6bd8: Merge "docs: studio remove gradle tasks dialog" into lmp-docs * commit 'fea8ddd4c7a79cc68a96901f86cfa527bbd44fd0': docs: studio remove gradle tasks dialog
| * | | | am c1002dfc: am 71a616e0: am 203a4739: am 1fcc6bd8: Merge "docs: studio ↵Rich Slogar2015-04-175-28/+12
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | remove gradle tasks dialog" into lmp-docs * commit 'c1002dfc52ec2827d24b6c4722a47abbb99b7f16': docs: studio remove gradle tasks dialog
| | * | | Merge "docs: studio remove gradle tasks dialog" into lmp-docsRich Slogar2015-04-175-28/+12
| | |\ \ \
| | | * | | docs: studio remove gradle tasks dialogRich Slogar2015-04-155-28/+12
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If7517f49307a1e27b1d4053bd49ccdb07ffb758e
* | | | | | am 58befba6: am 124c4025: am 1252b4b8: am 61dd1dfd: am 684f3aa2: am ↵Rich Slogar2015-04-173-9/+20
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | efe861a4: Merge "docs: hierarchyviewer updates" into lmp-docs * commit '58befba6ac88b4216cac43f97a456d1119dcb972': docs: hierarchyviewer updates
| * | | | | am 1252b4b8: am 61dd1dfd: am 684f3aa2: am efe861a4: Merge "docs: ↵Rich Slogar2015-04-173-9/+20
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hierarchyviewer updates" into lmp-docs * commit '1252b4b8694a69150b79ecfd801ed62c6929edf3': docs: hierarchyviewer updates
| | * | | | Merge "docs: hierarchyviewer updates" into lmp-docsRich Slogar2015-04-173-9/+20
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | docs: hierarchyviewer updatesRich Slogar2015-04-153-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/19955159 Change-Id: I77da54048765eeb768ec59a0ce0cbe40d0ba9715
* | | | | | Merge "Document usesCleartextTraffic app-level attribute."Alex Klyubin2015-04-161-0/+27
|\ \ \ \ \ \
| * | | | | | Document usesCleartextTraffic app-level attribute.Alex Klyubin2015-04-151-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This updates the documentation of the application element of AndroidManifest.xml to mention the new android:usesCleartextTraffic attribute. This also updates the Javadoc of android.security.NetworkSecurityPolicy and ApplicationInfo to match. Bug: 19215516 Change-Id: I5c221b56addae8988b4db51994d18ae379d0fbe3
* | | | | | | am 81d0aabc: am 40955edf: am 14a982aa: Merge "Document hprof-conv -z"Brian Carlstrom2015-04-161-1/+5
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * commit '81d0aabcb5af11f8695793dbfac893d17688970e': Document hprof-conv -z
| * | | | | | am 14a982aa: Merge "Document hprof-conv -z"Brian Carlstrom2015-04-161-1/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '14a982aa7a38fa89c916c252996632d401b1d043': Document hprof-conv -z
| | * | | | | | Document hprof-conv -zBrian Carlstrom2015-04-161-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18473132 Change-Id: I3c0fcc2c15d4c590ed852f41aa4fd2a2531a6db8
* | | | | | | | am 808042e6: am e635f9b5: am 726466c2: am 11002022: am 5b6e91a6: am ↵Joe Fernandez2015-04-1528-46/+380
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | / / / / / | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | af5f2000: Merge "docs: Add Cross-References to Material Design Spec" into lmp-docs * commit '808042e6c2244b24acb30c0f33439c730fa0acd7': docs: Add Cross-References to Material Design Spec
| * | | | | | am 726466c2: am 11002022: am 5b6e91a6: am af5f2000: Merge "docs: Add ↵Joe Fernandez2015-04-1528-46/+380
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cross-References to Material Design Spec" into lmp-docs * commit '726466c22517a1dc4d549edfd32fc5447794d29e': docs: Add Cross-References to Material Design Spec
| | * | | | | Merge "docs: Add Cross-References to Material Design Spec" into lmp-docsJoe Fernandez2015-04-1428-46/+380
| | |\ \ \ \ \
| | | * | | | | docs: Add Cross-References to Material Design SpecJoe Fernandez2015-04-1428-46/+380
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | Change-Id: I6945f2234beb21b368a64ecad7a1680447310d5c
* | | | | | | am 38544901: am f2a57c69: am cda895c5: am c578bff7: am a80fc040: am ↵Dirk Dougherty2015-04-149-7/+541
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 00f857c5: Merge "Doc change: add new pages for Designed for Families." into lmp-docs * commit '38544901e6aa6934b032303be314a92dcde662f3': Doc change: add new pages for Designed for Families.
| * | | | | | am cda895c5: am c578bff7: am a80fc040: am 00f857c5: Merge "Doc change: add ↵Dirk Dougherty2015-04-149-7/+541
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new pages for Designed for Families." into lmp-docs * commit 'cda895c53d22496001ae59fae36f751cf04af3ed': Doc change: add new pages for Designed for Families.
| | * | | | | Merge "Doc change: add new pages for Designed for Families." into lmp-docsDirk Dougherty2015-04-149-7/+541
| | |\ \ \ \ \
| | | * | | | | Doc change: add new pages for Designed for Families.Dirk Dougherty2015-04-139-7/+541
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9bda34abf7b045213c0fcb7f044ee86155900808
| | * | | | | | Merge "Update "Investigating your RAM usage" for ART" into lmp-docsMathieu Chartier2015-04-131-51/+277
| | |\ \ \ \ \ \
| | | * | | | | | Update "Investigating your RAM usage" for ARTMathieu Chartier2015-04-131-51/+277
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19884954 Change-Id: I9a987c7bb0ab2a9d8b2ac870796969f073803d56 (cherry picked from commit d92c6bde3fc61e1ea90c54e4fd19d72f0b1a3987)
* | | | | | | | | am f46c8f5b: am c9393a5d: am 2b92e18b: am 76c9e47e: am 4301dd04: am ↵smain@google.com2015-04-1410-0/+120
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d60649c5: Merge "initial batch of NDK files for skeleton site build" into lmp-docs * commit 'f46c8f5bfcb30d7f9d8b91e6f193d7ab574e05e9': initial batch of NDK files for skeleton site build
| * | | | | | | | am 2b92e18b: am 76c9e47e: am 4301dd04: am d60649c5: Merge "initial batch of ↵smain@google.com2015-04-1410-0/+120
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NDK files for skeleton site build" into lmp-docs * commit '2b92e18b4bf70c88662dfa1137c4901daae4d4d5': initial batch of NDK files for skeleton site build
| | * \ \ \ \ \ \ \ am d60649c5: Merge "initial batch of NDK files for skeleton site build" into ↵smain@google.com2015-04-1310-0/+120
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-docs * commit 'd60649c541931a5a9e5972cdceac48b9042eaff4': initial batch of NDK files for skeleton site build
| | | * | | | | | | Merge "initial batch of NDK files for skeleton site build" into lmp-docssmain@google.com2015-04-1310-0/+120
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | initial batch of NDK files for skeleton site buildsmain@google.com2015-04-1310-0/+120
| | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I00152e817377c072f529940743499a3b6d91f80d
* | | | | | | | | | am 7fd2be12: am f828c92c: am 6b9e30fe: am 12020cf4: am 3e664c3b: am ↵Rich Slogar2015-04-141-1/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bdc20109: Merge "docs: systrace update" into lmp-docs * commit '7fd2be12d11a33c2ad622d8b49e74d6ba7a12be5': docs: systrace update
| * | | | | | | | | am 6b9e30fe: am 12020cf4: am 3e664c3b: am bdc20109: Merge "docs: systrace ↵Rich Slogar2015-04-141-1/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update" into lmp-docs * commit '6b9e30fe959e6c67687c52eeb152de623368695d': docs: systrace update
| | * | | | | | | | am bdc20109: Merge "docs: systrace update" into lmp-docsRich Slogar2015-04-131-1/+2
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bdc20109208d16144cd052b281e25e6e243b2547': docs: systrace update
| | | * | | | | | | Merge "docs: systrace update" into lmp-docsRich Slogar2015-04-131-1/+2
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | docs: systrace updateRich Slogar2015-03-311-1/+2
| | | | | |_|_|_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I693f6b3eef32a412dd1764d39706dcebef9e000c