summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-07-02am 0656acf7: am 55aebda6: Merge "Update the tests to 0.12.2" into idea133 ↵android-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-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-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_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releaseXavier Ducrohet
automerge: 601e801 * commit '0656acf71ab5045a4845a74e9e8c53874ce196fc': Update the tests to 0.12.2
2014-07-02am 55aebda6: Merge "Update the tests to 0.12.2" into idea133 automerge: 601e801Xavier Ducrohet
* commit '55aebda607efcc29b8d9d5e1a99d446e320ff288': Update the tests to 0.12.2
2014-07-02Merge "Update the tests to 0.12.2" into idea133Xavier Ducrohet
automerge: 601e801 * commit '601e801b7f12dbf1b0c4c3697b4b3849be57f79b': Update the tests to 0.12.2
2014-07-01Merge "Update the tests to 0.12.2" into idea133Xavier Ducrohet
2014-07-01Update the tests to 0.12.2Xavier Ducrohet
Change-Id: Ia68ea4418a045eb7edfa9baff5602fc615ec0224
2014-07-01am 86bf4abd: am 1b5bf8f4: Merge "Added "recommended Gradle plug-in version" ↵Alex Ruiz
constant." into idea133 automerge: 0f33137 * commit '86bf4abd76eb924cb9eae646eb73b6d301769f50': Added "recommended Gradle plug-in version" constant.
2014-07-01am 1b5bf8f4: Merge "Added "recommended Gradle plug-in version" constant." ↵Alex Ruiz
into idea133 automerge: 0f33137 * commit '1b5bf8f4e1ca18539c7424fbe4b8883e83aa8fba': Added "recommended Gradle plug-in version" constant.
2014-07-01Merge "Added "recommended Gradle plug-in version" constant." into idea133Alex Ruiz
automerge: 0f33137 * commit '0f33137150c171f9e31c23574b424edc44a3d73d': Added "recommended Gradle plug-in version" constant.
2014-07-01am 1a3ed2b0: am 518e1947: Merge "Minor edits to ↵Rebecca Chen
AllocationInfo.AllocationSorter and AllocationsParserTest." into idea133 automerge: 84f8869 * commit '1a3ed2b00ceb74d65436b832874df68d1bd37a43': Minor edits to AllocationInfo.AllocationSorter and AllocationsParserTest.
2014-07-01am 518e1947: Merge "Minor edits to AllocationInfo.AllocationSorter and ↵Rebecca Chen
AllocationsParserTest." into idea133 automerge: 84f8869 * commit '518e19470ce60977265e85dd8a215940a026af55': Minor edits to AllocationInfo.AllocationSorter and AllocationsParserTest.
2014-07-01Merge "Minor edits to AllocationInfo.AllocationSorter and ↵Rebecca Chen
AllocationsParserTest." into idea133 automerge: 84f8869 * commit '84f886961b36285e3bdf7cdbc29907369790ce21': Minor edits to AllocationInfo.AllocationSorter and AllocationsParserTest.
2014-07-01Merge "Added "recommended Gradle plug-in version" constant." into idea133Alex Ruiz
2014-07-01Added "recommended Gradle plug-in version" constant.Alex Ruiz
Fixes: https://code.google.com/p/android/issues/detail?id=72841 Change-Id: I4df05ce7c31a25db0615fd70bc95c484e2cd590a
2014-07-01Merge "Minor edits to AllocationInfo.AllocationSorter and ↵Rebecca Chen
AllocationsParserTest." into idea133
2014-06-30Minor edits to AllocationInfo.AllocationSorter and AllocationsParserTest.Rebecca Chen
Adds annotations to AllocationSorter and new method AllocationSorter#setSortMode(SortMode, boolean). Exposes AllocationsParserTest#putAllocationInfo(). Change-Id: Ia64c694a4cd490d46b6d95941de520e4d9eaec7d Signed-off-by: Rebecca Chen <rechen@google.com>
2014-06-30am 6339aeae: am 8fac415b: Merge "Fixed bug where it was not possible to ↵Alex Ruiz
install \'android-L\' from inside the IDE." into idea133 automerge: 93d3414 * commit '6339aeae03b350b25d57c7a0cccc9826878d4ecf': Fixed bug where it was not possible to install 'android-L' from inside the IDE.
2014-06-30am 8fac415b: Merge "Fixed bug where it was not possible to install ↵Alex Ruiz
\'android-L\' from inside the IDE." into idea133 automerge: 93d3414 * commit '8fac415bb26d4c117ea82a12ca8373e6d43a4d7c': Fixed bug where it was not possible to install 'android-L' from inside the IDE.
2014-06-30Merge "Fixed bug where it was not possible to install \'android-L\' from ↵Alex Ruiz
inside the IDE." into idea133 automerge: 93d3414 * commit '93d3414ccd707e021e8b8fcd1367d9ddb9795684': Fixed bug where it was not possible to install 'android-L' from inside the IDE.
2014-06-27am b30d3829: am c8b78f11: Merge "Switch to version 0.12.1" into idea133 ↵Xavier Ducrohet
automerge: dcae4d1 * commit 'b30d3829172af9e0f1a73d32139315c2c831cd0c': Switch to version 0.12.1
2014-06-27am c8b78f11: Merge "Switch to version 0.12.1" into idea133 automerge: dcae4d1Xavier Ducrohet
* commit 'c8b78f11ece0215ad49d3937ef65acc3f8e7d872': Switch to version 0.12.1
2014-06-27Merge "Switch to version 0.12.1" into idea133Xavier Ducrohet
automerge: dcae4d1 * commit 'dcae4d18915384996282a18b84b9196339b60588': Switch to version 0.12.1
2014-06-27am 48e51cec: am 831b779a: Merge "Fix package merging when package was ↵Xavier Ducrohet
expressed in overlay manifest." into idea133 automerge: a591910 * commit '48e51cecd6961686f81e2cf428ecec0ed8358402': Fix package merging when package was expressed in overlay manifest.
2014-06-27am 831b779a: Merge "Fix package merging when package was expressed in ↵Xavier Ducrohet
overlay manifest." into idea133 automerge: a591910 * commit '831b779a0a1d99247ce72ebcc23d34cf7e894f61': Fix package merging when package was expressed in overlay manifest.
2014-06-27Merge "Fix package merging when package was expressed in overlay manifest." ↵Xavier Ducrohet
into idea133 automerge: a591910 * commit 'a59191040c8fc242a7b0645d4258aab6591d39b8': Fix package merging when package was expressed in overlay manifest.
2014-06-27am ab2f553f: am 4677268a: Merge "Add a test to make sure local jars are add ↵Xavier Ducrohet
to lib project deps." into idea133 automerge: 72330df * commit 'ab2f553f75f562ba3e0b8337f0a6628ed0e028b4': Add a test to make sure local jars are add to lib project deps.
2014-06-27am 4677268a: Merge "Add a test to make sure local jars are add to lib ↵Xavier Ducrohet
project deps." into idea133 automerge: 72330df * commit '4677268a7ad541f9e6e6e79e10c406c36a913f11': Add a test to make sure local jars are add to lib project deps.
2014-06-27Merge "Add a test to make sure local jars are add to lib project deps." into ↵Xavier Ducrohet
idea133 automerge: 72330df * commit '72330dfcd392a59bf57e0d0a6a5c642912b8487e': Add a test to make sure local jars are add to lib project deps.
2014-06-27Merge "Fixed bug where it was not possible to install 'android-L' from ↵Alex Ruiz
inside the IDE." into idea133
2014-06-30Fixed bug where it was not possible to install 'android-L' from inside the IDE.Alex Ruiz
The problem is in PkgDesc#getInstallId(). It was converting 'android-L' to 'android-l' making installation fail. Change-Id: If8c933748f6bb37aec3a4bfd7fc719fba3243e60
2014-06-27Merge "Fix package merging when package was expressed in overlay manifest." ↵Xavier Ducrohet
into idea133
2014-06-27Fix package merging when package was expressed in overlay manifest.Jerome Dochez
When merging manifest element attribute, do not consider the current file type (which may be outdated since we are merging in other documents). Instead use the lower priority document document type (overlay, main or library) to determine how we should merge manifest elements attributes. Bug: 72450 Change-Id: I85d0969039d6e5d19e8894553db75f08d2007edf
2014-06-26Merge "Switch to version 0.12.1" into idea133Xavier Ducrohet
2014-06-27Switch to version 0.12.1Xavier Ducrohet
Change-Id: I0147e5b088a8c11e2ba99248084a62d27bd09b1a
2014-06-26Merge "Add a test to make sure local jars are add to lib project deps." into ↵Xavier Ducrohet
idea133
2014-06-27Add a test to make sure local jars are add to lib project deps.Xavier Ducrohet
Change-Id: I25d4bbf9ed8d06b0f8569d592649c009fe99ed93
2014-06-26am d2eeb467: am 88606340: Merge "enhanced annotations test to check for ↵Jerome Dochez
annotations.zip presence" into idea133 automerge: c540a74 * commit 'd2eeb467380058c542c50bd477d2a0c1d68e8de2': enhanced annotations test to check for annotations.zip presence
2014-06-26am 6c501960: am 8162fdf7: Merge "Removed unused instance variables" into ↵Jerome Dochez
idea133 automerge: 6facd98 * commit '6c501960fc97118b2e48927c5876025cc094a154': Removed unused instance variables
2014-06-26am 77bcb319: am 865614ac: Merge "changes for gradle 2.0-rc1 support." into ↵Jerome Dochez
idea133 automerge: 57b3507 * commit '77bcb319830b42642950c9a5182b9005659468d9': changes for gradle 2.0-rc1 support.
2014-06-26am 88606340: Merge "enhanced annotations test to check for annotations.zip ↵Jerome Dochez
presence" into idea133 automerge: c540a74 * commit '886063404576cf1eede65b28811f404015da4f10': enhanced annotations test to check for annotations.zip presence
2014-06-26am 8162fdf7: Merge "Removed unused instance variables" into idea133 ↵Jerome Dochez
automerge: 6facd98 * commit '8162fdf759da58a2b9fd098fd2cb1484f985914d': Removed unused instance variables
2014-06-26am 865614ac: Merge "changes for gradle 2.0-rc1 support." into idea133 ↵Jerome Dochez
automerge: 57b3507 * commit '865614ace00a8db3bf1a158d23844d693b698e9f': changes for gradle 2.0-rc1 support.
2014-06-26Merge "enhanced annotations test to check for annotations.zip presence" into ↵Jerome Dochez
idea133 automerge: c540a74 * commit 'c540a7494c6c21d8d930cc9a64b88fb88003bf8c': enhanced annotations test to check for annotations.zip presence
2014-06-26Merge "Removed unused instance variables" into idea133Jerome Dochez
automerge: 6facd98 * commit '6facd9879d7d658ca5cbeae1f9fad0cb99e05dfc': Removed unused instance variables
2014-06-26Merge "changes for gradle 2.0-rc1 support." into idea133Jerome Dochez
automerge: 57b3507 * commit '57b35079796370e4fee1ba3722d85dae3d651bcb': changes for gradle 2.0-rc1 support.
2014-06-26am e7b48245: am 45ea29f9: Merge "Removed some deprecated guava APIs that ↵Jerome Dochez
have disappeared in version 17." into idea133 automerge: 47f5213 * commit 'e7b482457e4b549d26bc793efc5b0a01078f3a0c': Removed some deprecated guava APIs that have disappeared in version 17.
2014-06-26am 45ea29f9: Merge "Removed some deprecated guava APIs that have disappeared ↵Jerome Dochez
in version 17." into idea133 automerge: 47f5213 * commit '45ea29f996253b38e655f8de5ad0ebbfdaabefc1': Removed some deprecated guava APIs that have disappeared in version 17.
2014-06-26Merge "Removed some deprecated guava APIs that have disappeared in version ↵Jerome Dochez
17." into idea133 automerge: 47f5213 * commit '47f5213963e2edac789b1f88f1037dcc14f80fcd': Removed some deprecated guava APIs that have disappeared in version 17.
2014-06-25Merge "changes for gradle 2.0-rc1 support." into idea133Jerome Dochez
2014-06-25Merge "enhanced annotations test to check for annotations.zip presence" into ↵Jerome Dochez
idea133
2014-06-25Merge "Removed some deprecated guava APIs that have disappeared in version ↵Jerome Dochez
17." into idea133
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 09:05:00 +0000