summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-02-03merge in lmp-mr1-release history after reset to lmp-mr1-devandroid-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1lollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-cts-releaseThe Android Automerger
2015-02-02am d71cda54: am a1c4e3c3: Fix a syntax error in the link rendering macrolollipop-mr1-devJeff Arneson
* commit 'd71cda5440383925192953226deb316fabebf605': Fix a syntax error in the link rendering macro
2015-02-02am a1c4e3c3: Fix a syntax error in the link rendering macroJeff Arneson
* commit 'a1c4e3c3f512c972823b0076303400489cb16abf': Fix a syntax error in the link rendering macro
2015-02-02Fix a syntax error in the link rendering macroJeff Arneson
Change-Id: Ifedeaeee9230ea1eea5585046e4ece0483011391
2015-01-19merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger
2015-01-16am 07460a4e: am 9bb67673: Support new Analyze subtab under Distribute.Dirk Dougherty
* commit '07460a4e381c16753f94083b817f401eb76c2bf3': Support new Analyze subtab under Distribute.
2015-01-16am 9bb67673: Support new Analyze subtab under Distribute.Dirk Dougherty
* commit '9bb6767395b15d8f7762dd226eb85a219950f2a1': Support new Analyze subtab under Distribute.
2015-01-15Support new Analyze subtab under Distribute.Dirk Dougherty
Change-Id: Ic9142800c65d59418ab4036d0a86d904e5b07527
2015-01-13merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger
2015-01-12am d4c4946f: am f798f20a: Fix href in @linkplain links when not on the ↵Jeff Arneson
federated site * commit 'd4c4946ffdd2c38741ac630b8c47da86b3c40475': Fix href in @linkplain links when not on the federated site
2015-01-12am f798f20a: Fix href in @linkplain links when not on the federated siteJeff Arneson
* commit 'f798f20ade2fa2361f7561d77b2f3fdb0345ebf5': Fix href in @linkplain links when not on the federated site
2015-01-08Fix href in @linkplain links when not on the federated siteJeff Arneson
Bug: 18945445 Change-Id: I6c5ae6efc16f747470c4ab21076b030a32335f20
2015-01-07merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger
2015-01-07am ed3de62f: am 92393f10: Render @linkplain links in regular font rather ↵Jeff Arneson
than code font * commit 'ed3de62f999dfa2b4d9ee3c55919fa63059fb3c6': Render @linkplain links in regular font rather than code font
2015-01-06am 92393f10: Render @linkplain links in regular font rather than code fontJeff Arneson
* commit '92393f10b7c1922425d8c4c77df5dd35a6d145ed': Render @linkplain links in regular font rather than code font
2015-01-05Render @linkplain links in regular font rather than code fontJeff Arneson
BUG: 18499941 Change-Id: Ic53fc04ddfff2a5fbf83bc8eb68b423f9e68eded
2014-12-04am 147b50b6: am 2e055d0e: DO NOT MERGE: Fix docs for classes that implement ↵Jeff Arneson
or extend generics with type parameters * commit '147b50b6cac45f23c3ca0229bf24a5a4e85c4d37': DO NOT MERGE: Fix docs for classes that implement or extend generics with type parameters
2014-12-04am 2e055d0e: DO NOT MERGE: Fix docs for classes that implement or extend ↵Jeff Arneson
generics with type parameters * commit '2e055d0e61fdda6b791bdcb076419310a31c24d8': DO NOT MERGE: Fix docs for classes that implement or extend generics with type parameters
2014-12-03merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger
2014-12-02DO NOT MERGE: Fix docs for classes that implement or extend generics with ↵Jeff Arneson
type parameters The type paramater data was being lost on interfaces and base classes when iterating through the hierarchy. This is fixed by passing along TypeInfos that keep track of the parameterized types to the superclasses, interfaces, and methods in the inheritance chains. Bug: 18078691 Change-Id: I8a614e6f51862c5550766d58e33205040dab3dfb (cherry picked from commit d6570b0b7f66519ba50c18d9e08db423bdf1341e)
2014-11-26Fix docs for classes that implement or extend generics with type parametersJeff Arneson
The type paramater data was being lost on interfaces and base classes when iterating through the hierarchy. This is fixed by passing along TypeInfos that keep track of the parameterized types to the superclasses, interfaces, and methods in the inheritance chains. Bug: 18078691 Change-Id: I8a614e6f51862c5550766d58e33205040dab3dfb
2014-11-08merge in lmp-mr1-release history after reset to ↵The Android Automerger
f8a3be52b9a4eb3086db5cbe236e99f0a5a05f5d
2014-11-06merge in lmp-mr1-release history after reset to ↵The Android Automerger
f8a3be52b9a4eb3086db5cbe236e99f0a5a05f5d
2014-11-05merge in lmp-mr1-release history after reset to ↵The Android Automerger
f8a3be52b9a4eb3086db5cbe236e99f0a5a05f5d
2014-11-04merge in lmp-mr1-release history after reset to ↵The Android Automerger
f8a3be52b9a4eb3086db5cbe236e99f0a5a05f5d
2014-11-03merge in lmp-mr1-release history after reset to ↵The Android Automerger
f8a3be52b9a4eb3086db5cbe236e99f0a5a05f5d
2014-11-02merge in lmp-mr1-release history after reset to ↵The Android Automerger
f8a3be52b9a4eb3086db5cbe236e99f0a5a05f5d
2014-11-01merge in lmp-mr1-release history after reset to ↵The Android Automerger
f8a3be52b9a4eb3086db5cbe236e99f0a5a05f5d
2014-10-30merge in lmp-mr1-release history after reset to ↵The Android Automerger
f8a3be52b9a4eb3086db5cbe236e99f0a5a05f5d
2014-10-29Add generics to the field types in the API file. automerge: 5db09cdYing Wang
automerge: 5787d1d * commit '5787d1d37567e027bc790f5b2c6855400b32f84a': Add generics to the field types in the API file.
2014-10-29Add generics to the field types in the API file.Ying Wang
automerge: 1e62346 * commit '1e62346e7cb16254b31877f30741cd30637b043f': Add generics to the field types in the API file.
2014-10-29merge in lmp-mr1-release history after reset to ↵The Android Automerger
7751817561b5fea6ffaee8cad497ab6876deca0e
2014-10-28merge in lmp-mr1-release history after reset to ↵The Android Automerger
7751817561b5fea6ffaee8cad497ab6876deca0e
2014-10-28Add generics to the field types in the API file.Ying Wang
automerge: 5db09cd * commit '5db09cd932e64b0c160cac4fdf162d225b220e5a': Add generics to the field types in the API file.
2014-10-28Add generics to the field types in the API file.Ying Wang
Bug: 17014855 Change-Id: Id014329254613f04adcb33cd46a2d4930f0c1d91 (cherry picked from commit 5db09cd932e64b0c160cac4fdf162d225b220e5a)
2014-10-28Add generics to the field types in the API file.Ying Wang
Bug: 17014855 Change-Id: Id014329254613f04adcb33cd46a2d4930f0c1d91 (cherry picked from commit 5db09cd932e64b0c160cac4fdf162d225b220e5a)
2014-10-27merge in lmp-mr1-release history after reset to ↵The Android Automerger
9ee73fde5ad41d815ddfdc4e058cc5e49c81fe51
2014-10-26merge in lmp-mr1-release history after reset to ↵The Android Automerger
9ee73fde5ad41d815ddfdc4e058cc5e49c81fe51
2014-10-25merge in lmp-mr1-release history after reset to ↵The Android Automerger
9ee73fde5ad41d815ddfdc4e058cc5e49c81fe51
2014-10-23merge in lmp-mr1-release history after reset to ↵The Android Automerger
9ee73fde5ad41d815ddfdc4e058cc5e49c81fe51
2014-10-22merge in lmp-mr1-release history after reset to ↵The Android Automerger
9ee73fde5ad41d815ddfdc4e058cc5e49c81fe51
2014-10-21merge in lmp-mr1-release history after reset to ↵The Android Automerger
9ee73fde5ad41d815ddfdc4e058cc5e49c81fe51
2014-10-20Add generics to the field types in the API file.Ying Wang
Bug: 17014855 Change-Id: Id014329254613f04adcb33cd46a2d4930f0c1d91
2014-10-20merge in lmp-mr1-release history after reset to ↵The Android Automerger
9ee73fde5ad41d815ddfdc4e058cc5e49c81fe51
2014-10-19merge in lmp-mr1-release history after reset to ↵The Android Automerger
9ee73fde5ad41d815ddfdc4e058cc5e49c81fe51
2014-10-18merge in lmp-mr1-release history after reset to ↵The Android Automerger
9ee73fde5ad41d815ddfdc4e058cc5e49c81fe51
2014-10-16merge in lmp-mr1-release history after reset to ↵The Android Automerger
9ee73fde5ad41d815ddfdc4e058cc5e49c81fe51
2014-10-15merge in lmp-mr1-release history after reset to ↵The Android Automerger
4e67d82e0697805122796afec21f46e544eb309c
2014-10-14Inner classes export showAnnotations from their containing classlollipop-devJeff Arneson
Updated the makeHDF methods on ClassInfo to grab showAnnotations recursively from the containing classes if they exist. getAnnotationsIncludeOuters is the helper method to do this. Nothing was changed about deciding visibility of said inner classes, as it seems to work really well already. Change-Id: Idbe7a2ee8fd5c455bb08bb3e53424630ec772267 Bug: 17900353
2014-10-14merge in lmp-mr1-release history after reset to ↵The Android Automerger
4e67d82e0697805122796afec21f46e544eb309c
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 01:38:39 +0000