6 years agoMerge "Move version to 22." rel-roth-r2-partner rel-roth-r3-partner rel-tegranote-r3-partner daily-2013.10.28.1_rel-roth-r2-partner daily-2013.10.28.2_rel-roth-r2-partner daily-2013.10.29.0_rel-roth-r2-partner daily-2013.11.06.0_rel-roth-r2-partner daily-2013.12.03.0_rel-roth-r3-partner daily-2013.12.26.0_rel-roth-r3-partner daily-2014.01.08.0_rel-tegranote-r3-partner daily-2014.02.03.0_rel-roth-r3-partner
Xavier Ducrohet [Thu, 28 Mar 2013 16:54:08 +0000]
Merge "Move version to 22."

6 years agoMove version to 22.
Xavier Ducrohet [Thu, 28 Mar 2013 16:53:21 +0000]
Move version to 22.

Change-Id: I0ad49f74ccbd9f0855b6e2548ec1f8f874260aec

6 years agoMerge changes I6f71d0b9,Ia1093c6e
Xavier Ducrohet [Wed, 27 Mar 2013 22:20:57 +0000]
Merge changes I6f71d0b9,Ia1093c6e

* changes:
  Make the Gradle plugin compatible with 1.5
  Use Gradle 1.5

6 years agoMake the Gradle plugin compatible with 1.5
Xavier Ducrohet [Fri, 22 Mar 2013 23:52:35 +0000]
Make the Gradle plugin compatible with 1.5

Change-Id: I6f71d0b9dc8a31b5858a5ef63588356266c4611f

6 years agoUse Gradle 1.5
Xavier Ducrohet [Fri, 22 Mar 2013 22:01:15 +0000]
Use Gradle 1.5

Change-Id: Ia1093c6e3fcb33052bb98bd5dd00d9aad4900fad

6 years agoMerge "Add getSourceSets on extension object."
Xavier Ducrohet [Tue, 26 Mar 2013 22:00:33 +0000]
Merge "Add getSourceSets on extension object."

6 years agoAdd getSourceSets on extension object.
Xavier Ducrohet [Tue, 26 Mar 2013 20:57:30 +0000]
Add getSourceSets on extension object.

Change-Id: Ifed369c3e397c031326c10778d17241eb3f6cccf

6 years agoMerge "Change dependencies to reflect version change in base."
Xavier Ducrohet [Tue, 26 Mar 2013 00:17:04 +0000]
Merge "Change dependencies to reflect version change in base."

6 years agoChange dependencies to reflect version change in base.
Xavier Ducrohet [Tue, 26 Mar 2013 00:11:10 +0000]
Change dependencies to reflect version change in base.

Change-Id: Ib8d8074b3ea19099f9076e750469420411dd1cd8

6 years agoMerge "Use the right version of build tools."
Xavier Ducrohet [Tue, 26 Mar 2013 00:04:53 +0000]
Merge "Use the right version of build tools."

6 years agoUse the right version of build tools.
Xavier Ducrohet [Tue, 26 Mar 2013 00:03:31 +0000]
Use the right version of build tools.

Change-Id: I80ebd53f2f46213001633c135c7fd9a5f8502658

6 years agoMerge "Fix the fake Android Target."
Xavier Ducrohet [Sat, 23 Mar 2013 00:02:17 +0000]
Merge "Fix the fake Android Target."

6 years agoFix the fake Android Target.
Xavier Ducrohet [Sat, 23 Mar 2013 00:01:25 +0000]
Fix the fake Android Target.

Change-Id: I2d62ccc1a8ac383f7794d8188c05ea1fcebdda8e

6 years agoMerge "Add support for build-tools."
Xavier Ducrohet [Fri, 22 Mar 2013 21:56:14 +0000]
Merge "Add support for build-tools."

6 years agoAdd support for build-tools.
Xavier Ducrohet [Tue, 12 Mar 2013 20:56:13 +0000]
Add support for build-tools.

Change-Id: I6c355e2e2459987224e4fac3fdd8c02d2f4fc905

6 years agoMerge "Sign apk using bouncyCastle."
Xavier Ducrohet [Thu, 21 Mar 2013 16:28:45 +0000]
Merge "Sign apk using bouncyCastle."

6 years agoSign apk using bouncyCastle.
Xavier Ducrohet [Thu, 21 Mar 2013 02:11:47 +0000]
Sign apk using bouncyCastle.

Change-Id: If112620dbce3c20fe212765707513afcad402fd1

6 years agoMerge "Fix package renaming."
Xavier Ducrohet [Thu, 21 Mar 2013 00:25:48 +0000]
Merge "Fix package renaming."

6 years agoMerge "Only package local dependencies in builder."
Xavier Ducrohet [Tue, 19 Mar 2013 22:06:06 +0000]
Merge "Only package local dependencies in builder."

6 years agoOnly package local dependencies in builder.
Xavier Ducrohet [Tue, 19 Mar 2013 21:31:03 +0000]
Only package local dependencies in builder.

the builder library previously packaged all its
dependencies in its jar. This started breaking
when bouncycastle was added due some issue in the
manifest.

This solves it but also does something we should have
done a while ago.

Now only the local dependencies (mostly tools/base) are
packaged in builder, while the external dependencies are
now declared as dependencies. Since the builder is pushed
to MavenCentral the dependencies can be found there.
(Sample projects find them in the local repo clone).

Change-Id: I789a2950056d0fe49c5f8fbaa11b149cc75a6361

6 years agoFix package renaming.
Xavier Ducrohet [Sat, 16 Mar 2013 01:40:17 +0000]
Fix package renaming.

The previous mechanism used --rename-manifest-package while letting
the created manifest have the old package name. While this rename
the package entry in the manifest, the resource pool was still
associated to the original package name which made thinkgs awkward.

The new mechanism uses the new feature of the manifest-merger that allows
updating the package name. This means the application is compiled
completely using the new package.
In order to keep the R class sane though, aapt is called with
--custom-package to override only the location of the R class.

Change-Id: I0162dab6ca1cdeaf40e0c92d351f0290f01fd216

6 years agoMerge "Minor API fixes."
Xavier Ducrohet [Fri, 15 Mar 2013 20:57:39 +0000]
Merge "Minor API fixes."

6 years agoMerge "Detect java plugin and display a nicer error message."
Xavier Ducrohet [Fri, 15 Mar 2013 20:55:13 +0000]
Merge "Detect java plugin and display a nicer error message."

6 years agoMerge "Refactor dependency classes in their package."
Xavier Ducrohet [Fri, 15 Mar 2013 20:54:56 +0000]
Merge "Refactor dependency classes in their package."

6 years agoMerge "Fix support for local jars in library projects."
Xavier Ducrohet [Fri, 15 Mar 2013 20:54:16 +0000]
Merge "Fix support for local jars in library projects."

6 years agoMinor API fixes.
Xavier Ducrohet [Fri, 15 Mar 2013 20:27:49 +0000]
Minor API fixes.

Change-Id: Ib0d2419d7c83a14dbb041ac3722f09e17cb89bd2

6 years agoDetect java plugin and display a nicer error message.
Xavier Ducrohet [Fri, 15 Mar 2013 19:52:25 +0000]
Detect java plugin and display a nicer error message.

The android and Java plugin cannot both be applied but if they
are the error is hard to figure out what the root of the problem
is.

Change-Id: Ia3e76eb2b73c6fb0276593919d2530cbf98df180

6 years agoRefactor dependency classes in their package.
Xavier Ducrohet [Fri, 15 Mar 2013 19:24:45 +0000]
Refactor dependency classes in their package.

Change-Id: I6ccebb0bc4c5ff1a25c166bd17b00cfa6d8acdc7

6 years agoFix support for local jars in library projects.
Xavier Ducrohet [Fri, 15 Mar 2013 01:37:18 +0000]
Fix support for local jars in library projects.

Change-Id: If19406b935965bde63a761236366137f6fb5d73f

6 years agoMerge "Add support for subfolders in assets folders."
Xavier Ducrohet [Fri, 15 Mar 2013 01:35:06 +0000]
Merge "Add support for subfolders in assets folders."

6 years agoMerge "Fix dependencies."
Xavier Ducrohet [Tue, 12 Mar 2013 00:39:44 +0000]
Merge "Fix dependencies."

6 years agoFix dependencies.
Xavier Ducrohet [Tue, 12 Mar 2013 00:37:54 +0000]
Fix dependencies.

Change-Id: Idc04302220a08fefc2f2580bd010da79cd1fb86f

6 years agoMerge "fix test to handle PST->PDT changes."
Xavier Ducrohet [Mon, 11 Mar 2013 21:06:22 +0000]
Merge "fix test to handle PST->PDT changes."

6 years agofix test to handle PST->PDT changes.
Xavier Ducrohet [Mon, 11 Mar 2013 21:05:17 +0000]
fix test to handle PST->PDT changes.

Change-Id: Id5197c574c9db3845588b3a2924eb320ff6ae1e1

6 years agoAdd support for subfolders in assets folders.
Xavier Ducrohet [Tue, 5 Mar 2013 00:39:53 +0000]
Add support for subfolders in assets folders.

Change-Id: Icdae718e8bf3d4c5cadc7e709745cfa1cefc64a4

6 years agoMerge "Use the new bootclasspath API."
Xavier Ducrohet [Wed, 27 Feb 2013 17:49:41 +0000]
Merge "Use the new bootclasspath API."

6 years agoUse the new bootclasspath API.
Xavier Ducrohet [Wed, 27 Feb 2013 02:31:50 +0000]
Use the new bootclasspath API.

Change-Id: Ie27bf82072f3f2a5d26b2f449b03d83653b77898

6 years agoMerge "Move to 0.4"
Xavier Ducrohet [Tue, 26 Feb 2013 20:01:59 +0000]
Merge "Move to 0.4"

6 years agoMove to 0.4
Xavier Ducrohet [Tue, 26 Feb 2013 19:57:02 +0000]
Move to 0.4

Change-Id: I5c8c599698e489cb83b9ffa6f7a1ef3a9cd27fb6

6 years agoMerge "Properly handle broken resource files."
Xavier Ducrohet [Mon, 25 Feb 2013 22:06:07 +0000]
Merge "Properly handle broken resource files."

6 years agoProperly handle broken resource files.
Xavier Ducrohet [Mon, 25 Feb 2013 19:21:49 +0000]
Properly handle broken resource files.

Change-Id: I908ffd523c60e341a08e8d857a43045869806e3c

6 years agoMerge "Tweak BuildVariant API."
Xavier Ducrohet [Thu, 21 Feb 2013 19:39:21 +0000]
Merge "Tweak BuildVariant API."

6 years agoTweak BuildVariant API.
Xavier Ducrohet [Wed, 20 Feb 2013 20:46:29 +0000]
Tweak BuildVariant API.

Change-Id: I8d60b47ae731347a21f44f4c352ec9a6d2b7f100

6 years agoMerge "Misc tweak to the APIs."
Xavier Ducrohet [Wed, 20 Feb 2013 18:09:11 +0000]
Merge "Misc tweak to the APIs."

6 years agoMerge "Make instrument(ation)Test more consistent everywhere."
Xavier Ducrohet [Wed, 20 Feb 2013 18:08:57 +0000]
Merge "Make instrument(ation)Test more consistent everywhere."

6 years agoMisc tweak to the APIs.
Xavier Ducrohet [Wed, 20 Feb 2013 01:10:22 +0000]
Misc tweak to the APIs.

Change-Id: I0369c8cd35708611daf869eabce909042662f3c0

6 years agoMake instrument(ation)Test more consistent everywhere.
Xavier Ducrohet [Tue, 19 Feb 2013 20:15:06 +0000]
Make instrument(ation)Test more consistent everywhere.

Change-Id: I15aeaab2deae50a096e5b0620da49349f56f96e4

6 years agoMerge "Update samples: src/test -> src/instrumentTest"
Xavier Ducrohet [Tue, 19 Feb 2013 19:49:52 +0000]
Merge "Update samples: src/test -> src/instrumentTest"

6 years agoMerge "Change tests to be instrumentationTests everywhere."
Xavier Ducrohet [Tue, 19 Feb 2013 19:49:27 +0000]
Merge "Change tests to be instrumentationTests everywhere."

6 years agoUpdate samples: src/test -> src/instrumentTest
Xavier Ducrohet [Tue, 19 Feb 2013 18:17:28 +0000]
Update samples: src/test -> src/instrumentTest

No other changes besides moving the files.

Change-Id: Ibbfa5be4af901c939374ef4bc4ec7c36096e3f22

6 years agoChange tests to be instrumentationTests everywhere.
Xavier Ducrohet [Tue, 19 Feb 2013 00:55:29 +0000]
Change tests to be instrumentationTests everywhere.

This is to not collide with jUnit 'tests'. The idea is
to allow regular jUnit tests in the same project, alongside
instrumentation (and ui automator) tests.

Change-Id: I8db8527f82f16860a83c1d2def996e8074282c5d

6 years agoMerge "Make lint a reserved name."
Xavier Ducrohet [Mon, 18 Feb 2013 20:43:12 +0000]
Merge "Make lint a reserved name."

6 years agoMake lint a reserved name.
Xavier Ducrohet [Mon, 18 Feb 2013 20:41:51 +0000]
Make lint a reserved name.

Change-Id: I67a37e4164333ba8dc9991ef5ce79693efff3bca

6 years agoMerge "Fix import of FullRevision."
Xavier Ducrohet [Fri, 15 Feb 2013 20:47:56 +0000]
Merge "Fix import of FullRevision."

6 years agoFix import of FullRevision.
Xavier Ducrohet [Fri, 15 Feb 2013 20:46:50 +0000]
Fix import of FullRevision.

Also fix a couple of minor things.

Change-Id: Iba426427e9ec44a2a7f00043e222dc42f21fccec

6 years agoMerge "Clean up: use constants where we should be using them."
Xavier Ducrohet [Fri, 15 Feb 2013 20:30:53 +0000]
Merge "Clean up: use constants where we should be using them."

6 years agoMerge "SDK: change gradle output dir to out/host/gradle."
Raphael Moll [Fri, 15 Feb 2013 20:03:01 +0000]
Merge "SDK: change gradle output dir to out/host/gradle."

6 years agoClean up: use constants where we should be using them.
Xavier Ducrohet [Fri, 15 Feb 2013 19:01:01 +0000]
Clean up: use constants where we should be using them.

Change-Id: I51ae6bbd97b0365595ddc84653e4a0ce18cbd6eb

6 years agoMerge changes Ic4e82c78,I1d8a60f2
Xavier Ducrohet [Fri, 15 Feb 2013 18:04:53 +0000]
Merge changes Ic4e82c78,I1d8a60f2

* changes:
  Add test exec duration to report.
  Fix reporting to handle multi-devices.

6 years agoMerge "Unlink instrumentation tests from the check task."
Xavier Ducrohet [Fri, 15 Feb 2013 01:30:45 +0000]
Merge "Unlink instrumentation tests from the check task."

6 years agoAdd test exec duration to report.
Xavier Ducrohet [Fri, 15 Feb 2013 01:13:13 +0000]
Add test exec duration to report.

Change-Id: Ic4e82c7877ae20de5969e15e937c4b9de7fe0757

6 years agoFix reporting to handle multi-devices.
Xavier Ducrohet [Thu, 14 Feb 2013 22:11:36 +0000]
Fix reporting to handle multi-devices.

Change-Id: I1d8a60f23ed3659297372a876fe57ff7b18f8440

6 years agoUnlink instrumentation tests from the check task.
Xavier Ducrohet [Thu, 14 Feb 2013 18:59:17 +0000]
Unlink instrumentation tests from the check task.

A clear separation between checks that requires and those that do
not require a device is better. This will allow to run lint and
other non-device checks separately more easily.

Also fix an issue with the location of ZipAlign.

Change-Id: I4fd58d6313ed5ab4559da0b3954b555ff1f41bcd

6 years agoMerge "Add a test app for assets support."
Xavier Ducrohet [Thu, 14 Feb 2013 18:49:16 +0000]
Merge "Add a test app for assets support."

6 years agoAdd a test app for assets support.
Xavier Ducrohet [Wed, 6 Feb 2013 03:11:52 +0000]
Add a test app for assets support.

Also fix some issues related to input detection of some tasks.

Change-Id: I38ac5a151fe1ac84c03fc0cafb8cab31117888a1

6 years agoMerge "New test to make sure we detect file changes with earlier lastmodified."
Xavier Ducrohet [Tue, 12 Feb 2013 23:15:26 +0000]
Merge "New test to make sure we detect file changes with earlier lastmodified."

6 years agoMerge "Automate testing build output on devices."
Xavier Ducrohet [Tue, 12 Feb 2013 23:14:22 +0000]
Merge "Automate testing build output on devices."

6 years agoSDK: change gradle output dir to out/host/gradle.
Raphael Moll [Tue, 12 Feb 2013 18:13:12 +0000]
SDK: change gradle output dir to out/host/gradle.

Change-Id: I73da941b4fa0c784ca11beec506279d496a02bf6

6 years agoam 82ba314e: Merge "SDK support improvements."
Xavier Ducrohet [Fri, 8 Feb 2013 01:59:06 +0000]
am 82ba314e: Merge "SDK support improvements."

# Via Gerrit Code Review (1) and Xavier Ducrohet (1)
* commit '82ba314ec674f669f91561aab6b69741cb7dab26':
  SDK support improvements.

6 years agoMerge "SDK support improvements."
Xavier Ducrohet [Fri, 8 Feb 2013 01:47:02 +0000]
Merge "SDK support improvements."

6 years agoNew test to make sure we detect file changes with earlier lastmodified.
Xavier Ducrohet [Fri, 8 Feb 2013 01:44:10 +0000]
New test to make sure we detect file changes with earlier lastmodified.

Change-Id: Ie6dd18d8e8080c9faa1799253f027e935dc381aa

6 years agoSDK support improvements.
Xavier Ducrohet [Wed, 30 Jan 2013 21:24:03 +0000]
SDK support improvements.

Move figuring out the path to aidl/aapt/dx/llvm-rs-cc from IAndroidTarget
to SdkParser (in preparation of the build-tools).

Also change android.target to android.compileSdkVersion to make it
less confusing with regards to min/targetSdkVersion and also change it
to take either an int or a string.

Change-Id: I8642cb84f67cf75b49abe905b2a65f4d26668e98

6 years agoam f306fd9a: Merge "Ensure check dependsOn on \'test\' for flavored builds."
Xavier Ducrohet [Thu, 7 Feb 2013 22:57:43 +0000]
am f306fd9a: Merge "Ensure check dependsOn on \'test\' for flavored builds."

# Via Gerrit Code Review (1) and Xavier Ducrohet (1)
* commit 'f306fd9ab01c82136ca5994bf0c3928ba6da5364':
  Ensure check dependsOn on 'test' for flavored builds.

6 years agoMerge "Ensure check dependsOn on 'test' for flavored builds."
Xavier Ducrohet [Thu, 7 Feb 2013 22:04:37 +0000]
Merge "Ensure check dependsOn on 'test' for flavored builds."

6 years agoAutomate testing build output on devices.
Xavier Ducrohet [Thu, 7 Feb 2013 22:00:13 +0000]
Automate testing build output on devices.

This is to test the plugin itself, not a feature of the plugin.

'gradlew deviceTest' is similar to 'gradlew buildTest' in that
it requires an SDK through ANDROID_HOME, and then builds a set
of projects.

It differs in that it then pushed the project (and its test project)
to a connected device and runs the test there.

Note: This is even longer running that buildTest, and since it
requires a device, it is not a dependence on check. This must
be run separately.

Change-Id: I9d211ef22a680a4fba62314e943de3fdd54e4eee

6 years agoEnsure check dependsOn on 'test' for flavored builds.
Xavier Ducrohet [Thu, 7 Feb 2013 19:53:07 +0000]
Ensure check dependsOn on 'test' for flavored builds.

Change-Id: If7206fd74b3f8425c22d2e23d8f14299a2efe63d

6 years agoam 36718f2a: Merge "Fix tests running on the server."
Xavier Ducrohet [Thu, 7 Feb 2013 01:00:50 +0000]
am 36718f2a: Merge "Fix tests running on the server."

# Via Gerrit Code Review (1) and Xavier Ducrohet (1)
* commit '36718f2a33f8bf0976cd23999a38dc9234fd671f':
  Fix tests running on the server.

6 years agoMerge "Fix tests running on the server."
Xavier Ducrohet [Thu, 7 Feb 2013 00:46:51 +0000]
Merge "Fix tests running on the server."

6 years agoFix tests running on the server.
Xavier Ducrohet [Thu, 7 Feb 2013 00:45:34 +0000]
Fix tests running on the server.

Change-Id: Ie74170cc51c16545c6a004aaba570c2bf11d7314

6 years agoam c3d26c65: Merge "Minor fix + more verbose assert in test to debug issue."
Xavier Ducrohet [Thu, 7 Feb 2013 00:27:06 +0000]
am c3d26c65: Merge "Minor fix + more verbose assert in test to debug issue."

# Via Gerrit Code Review (1) and Xavier Ducrohet (1)
* commit 'c3d26c652e7004324569c9384510214981f759b3':
  Minor fix + more verbose assert in test to debug issue.

6 years agoMerge "Minor fix + more verbose assert in test to debug issue."
Xavier Ducrohet [Thu, 7 Feb 2013 00:24:47 +0000]
Merge "Minor fix + more verbose assert in test to debug issue."

6 years agoMinor fix + more verbose assert in test to debug issue.
Xavier Ducrohet [Thu, 7 Feb 2013 00:23:43 +0000]
Minor fix + more verbose assert in test to debug issue.

Change-Id: If201822e568f670f41866f490651b7060a8416e1

6 years agoam 58622f85: Merge "Add findbugs plugin."
Xavier Ducrohet [Wed, 6 Feb 2013 23:34:46 +0000]
am 58622f85: Merge "Add findbugs plugin."

# Via Gerrit Code Review (1) and Xavier Ducrohet (1)
* commit '58622f859b622993a549c0acd78065991547e571':
  Add findbugs plugin.

6 years agoam 159ad4c0: Merge "Add multi assets folder support + assets in libraries."
Xavier Ducrohet [Wed, 6 Feb 2013 23:34:45 +0000]
am 159ad4c0: Merge "Add multi assets folder support + assets in libraries."

# Via Gerrit Code Review (1) and Xavier Ducrohet (1)
* commit '159ad4c01dc1a36e9eac39b2c39b8a642a99517b':
  Add multi assets folder support + assets in libraries.

6 years agoMerge "Add findbugs plugin."
Xavier Ducrohet [Wed, 6 Feb 2013 23:29:55 +0000]
Merge "Add findbugs plugin."

6 years agoAdd findbugs plugin.
Xavier Ducrohet [Wed, 6 Feb 2013 23:29:05 +0000]
Add findbugs plugin.

Change-Id: Id262ee77473e6c39fd98e2b4975bd9430c9dd79a

6 years agoMerge "Add multi assets folder support + assets in libraries."
Xavier Ducrohet [Wed, 6 Feb 2013 23:27:09 +0000]
Merge "Add multi assets folder support + assets in libraries."

6 years agoam 264f541a: Merge "Fix BuildTypeDsl.initWith."
Xavier Ducrohet [Wed, 6 Feb 2013 18:07:44 +0000]
am 264f541a: Merge "Fix BuildTypeDsl.initWith."

# Via Gerrit Code Review (1) and Xavier Ducrohet (1)
* commit '264f541ac762883308457aba7f4525c75815b9f5':
  Fix BuildTypeDsl.initWith.

6 years agoMerge "Fix BuildTypeDsl.initWith."
Xavier Ducrohet [Wed, 6 Feb 2013 18:03:00 +0000]
Merge "Fix BuildTypeDsl.initWith."

6 years agoFix BuildTypeDsl.initWith.
Xavier Ducrohet [Wed, 6 Feb 2013 03:22:20 +0000]
Fix BuildTypeDsl.initWith.

It was missing the duplication of the renderscript value.

Changed the test to catch this.

Change-Id: I3fda4fef7e7f7bf4787a5f4c70be8ab5d29c9646

6 years agoAdd multi assets folder support + assets in libraries.
Xavier Ducrohet [Tue, 29 Jan 2013 22:46:16 +0000]
Add multi assets folder support + assets in libraries.

Because managing those is very similar to resources,
this changeset refactors Resource(Item*), ResourceFile,
ResoureSet and ResourceMerger into base classes DataItem,
DataFile, DataSet and DataMerger providing most of the
mechanism to incrementally merge any type of data.

(* for consistency, Resource is renamed ResourceItem)

New classes to support the assets: AssetItem, AssetFile,
AssetSet, AssetMerger.

Also refactors the test data and add new test and test data
specifically for the asset.

Change-Id: I75d0a95aa330ab9ce25132800fe9ba2e57710b87

6 years agoam 6cb1c907: Merge "Add some javadoc."
Xavier Ducrohet [Fri, 1 Feb 2013 19:16:36 +0000]
am 6cb1c907: Merge "Add some javadoc."

# Via Gerrit Code Review (1) and Xavier Ducrohet (1)
* commit '6cb1c907b0143ca46f991f710c64d7247222f252':
  Add some javadoc.

6 years agoMerge "Add some javadoc."
Xavier Ducrohet [Fri, 1 Feb 2013 18:58:57 +0000]
Merge "Add some javadoc."

6 years agoAdd some javadoc.
Xavier Ducrohet [Fri, 1 Feb 2013 18:19:41 +0000]
Add some javadoc.

Change-Id: Id487fe605d1241eb64df67da9ac54c0dd98af9a9

6 years agoMerge from AOSP
Jean-Baptiste Queru [Fri, 1 Feb 2013 02:59:54 +0000]
Merge from AOSP

6 years agoMerge "Misc clean up."
Xavier Ducrohet [Fri, 1 Feb 2013 00:20:20 +0000]
Merge "Misc clean up."

6 years agoMisc clean up.
Xavier Ducrohet [Fri, 1 Feb 2013 00:19:05 +0000]
Misc clean up.

Change-Id: I18bc1d9567ebd91e67f0ca54d6bc420880af3953

6 years agoMerge "Fix generation of R class for libraries."
Xavier Ducrohet [Fri, 1 Feb 2013 00:14:36 +0000]
Merge "Fix generation of R class for libraries."

6 years agoMerge "Remove unneeded property on the rs task."
Xavier Ducrohet [Fri, 1 Feb 2013 00:13:37 +0000]
Merge "Remove unneeded property on the rs task."

6 years agoMerge "Clean dependencies of published libraries."
Xavier Ducrohet [Fri, 1 Feb 2013 00:13:13 +0000]
Merge "Clean dependencies of published libraries."