Commit Graph

13064 Commits

Author SHA1 Message Date
The Android Open Source Project ffb54540a7 am e2fe6c04: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'e2fe6c041f65faf3279b663b4392f934b898a85b':
  JWR64B
2013-06-03 17:16:34 -07:00
The Android Open Source Project e2fe6c041f Reconcile with jb-mr2-release - do not merge
Change-Id: I1168e923d0907bf1888bc2f894f7addfb559ca61
2013-06-03 16:43:33 -07:00
The Android Automerger 3f7da79c4e JWR64B 2013-06-03 15:51:04 -07:00
The Android Open Source Project f39d05083d am 20f6c310: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '20f6c310c70594e077310415b2756c9e1f42d6b5':
  "JWR64"
  "JWR63"
  JWR60E
  JWR60D
  JWR60C
  JWR60B
2013-06-03 14:03:46 -07:00
The Android Open Source Project 20f6c310c7 Reconcile with jb-mr2-release - do not merge
Change-Id: Ibaec6294f3598d965dba72d39859f24a76c8933b
2013-06-03 14:02:22 -07:00
The Android Automerger 8c5d8a6f94 "JWR64" 2013-06-03 05:55:38 -07:00
The Android Automerger 824a388645 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-06-03 05:55:04 -07:00
The Android Automerger b63470ae5b "JWR63" 2013-06-02 05:56:48 -07:00
The Android Automerger 57bcbfa21d merge in jb-mr2-release history after reset to jb-mr2-dev 2013-06-02 05:55:14 -07:00
The Android Automerger c41c56b4eb JWR60E 2013-05-31 13:41:15 -07:00
Ying Wang 8216f3228f Merge "Tweak proguard flags in the 2 files." 2013-05-31 15:24:56 +00:00
The Android Automerger 99ffbcf0f6 JWR60D 2013-05-30 19:02:55 -07:00
Stephen Hines 1e18897689 am 6c380fe5: am 1dd9f19e: Merge "add renderscript to support library javadocs" into jb-mr2-dev
* commit '6c380fe5da492c526f81c894a069e63ab62613de':
  add renderscript to support library javadocs
2013-05-30 15:34:00 -07:00
The Android Automerger 57bb5d4950 JWR60C 2013-05-30 15:26:43 -07:00
The Android Automerger 12c23b706e JWR60B 2013-05-30 14:36:32 -07:00
The Android Open Source Project 4896696371 am 041fd816: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '041fd81699448ff4fbcabeebe15bb7dedade9dfb':
  "JWR60"
  JWR59C
  JWR59B
2013-05-30 14:24:10 -07:00
Stephen Hines 6c380fe5da am 1dd9f19e: Merge "add renderscript to support library javadocs" into jb-mr2-dev
* commit '1dd9f19e8f020e691f08361668a1132181c267c5':
  add renderscript to support library javadocs
2013-05-30 14:14:29 -07:00
Stephen Hines 1dd9f19e8f Merge "add renderscript to support library javadocs" into jb-mr2-dev 2013-05-30 21:09:35 +00:00
Ying Wang 1b28087a58 Tweak proguard flags in the 2 files.
So all most commonly-used flags go to proguard_basic_keeps.flags
and they will still be applied when LOCAL_PROGUARD_ENABLED=nosystem.
Bug: 9203442

Change-Id: If018076dc625ac1efe31898b179dbba850218aaf
2013-05-30 10:45:46 -07:00
The Android Open Source Project 041fd81699 Reconcile with jb-mr2-release - do not merge
Change-Id: Iaf7449c8a3d44b7d692291a65c03ec59c2d2aedb
2013-05-30 07:31:18 -07:00
The Android Automerger 6f1fdccffa "JWR60" 2013-05-30 05:57:12 -07:00
The Android Automerger d6cb6f2fd9 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-30 05:55:21 -07:00
The Android Automerger e8d58c41e3 JWR59C 2013-05-29 17:53:49 -07:00
The Android Automerger e8eaac4de2 JWR59B 2013-05-29 15:40:24 -07:00
Kenny Root f957acbedf am a422266b: am 9016d0ae: Merge "Fix signing process for SELinux file_contexts" into jb-mr2-dev
* commit 'a422266b1c66e9fa37fbfcf22f273aaa99f16f00':
  Fix signing process for SELinux file_contexts
2013-05-29 15:30:23 -07:00
Kenny Root a422266b1c am 9016d0ae: Merge "Fix signing process for SELinux file_contexts" into jb-mr2-dev
* commit '9016d0aef415e00df636b6407a05e5e08e430ed8':
  Fix signing process for SELinux file_contexts
2013-05-29 15:26:26 -07:00
Kenny Root 9016d0aef4 Merge "Fix signing process for SELinux file_contexts" into jb-mr2-dev 2013-05-29 22:13:31 +00:00
Kenny Root e2e9f613b5 Fix signing process for SELinux file_contexts
When not building locally and just using a target-files.zip from some
other build, it still tries to access the file_contexts from the out/
directory. This change instead looks at the unzipped target-files.zip
hierarchy to grab that information.

Bug: 9191141
Change-Id: I6ea12e82d6c6376fcada412314c5eefc97ff4853
2013-05-29 14:38:48 -07:00
Scott Main af44e90b19 add renderscript to support library javadocs
Bug: 9188088

Change-Id: I7c34a99b73dc01c78174e5b93e5a5d3085ff81ff
2013-05-29 18:42:54 +00:00
The Android Open Source Project 8c229538c8 am 34949064: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '349490646f72d63eb88fcb806a96248b4146d319':
  "JWR59"
  JWR58C
  JWR58B
2013-05-29 08:07:04 -07:00
The Android Open Source Project 349490646f Reconcile with jb-mr2-release - do not merge
Change-Id: Ic2bedc28934c86a1d84c86ef081abba066b9f1e7
2013-05-29 08:05:48 -07:00
The Android Automerger 1e6107149f "JWR59" 2013-05-29 05:56:24 -07:00
The Android Automerger 549bc87583 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-29 05:55:06 -07:00
The Android Automerger 293deacab2 JWR58C 2013-05-28 18:15:01 -07:00
The Android Automerger 262d805451 JWR58B 2013-05-28 16:11:03 -07:00
The Android Open Source Project 659790fe81 am 95940790: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '95940790ad7160cfc9d497a9fe49446970f90056':
  "JWR58"
  "JWR57"
  "JWR56"
2013-05-28 13:50:15 -07:00
The Android Open Source Project 95940790ad Reconcile with jb-mr2-release - do not merge
Change-Id: I2a3754df164d9a9b56a1db167e0f10369e92efbe
2013-05-28 07:37:14 -07:00
The Android Automerger e796456cd4 "JWR58" 2013-05-28 05:55:19 -07:00
The Android Automerger 73b3e135ba merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-28 05:55:03 -07:00
The Android Automerger ca175af8af "JWR57" 2013-05-27 05:55:38 -07:00
The Android Automerger 9247f9f66a merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-27 05:55:05 -07:00
The Android Automerger 00f6b9bae5 "JWR56" 2013-05-26 05:56:30 -07:00
The Android Automerger dc9e4445f4 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-05-26 05:55:10 -07:00
The Android Open Source Project d37c0ab389 am 94bcfa0a: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '94bcfa0a09ec7ff8adecfdefc7a4f288f36aead1':
  JWR53F
  JWR53E
  JWR53D
  JWR53C
  JWR53B
2013-05-24 15:30:13 -07:00
The Android Open Source Project 94bcfa0a09 Reconcile with jb-mr2-release - do not merge
Change-Id: I541e66a266a81d270b206ead6c8b5b67489d63ef
2013-05-24 15:28:07 -07:00
The Android Automerger 23b0797c03 JWR53F 2013-05-24 15:21:35 -07:00
The Android Automerger 058ea7d941 JWR53E 2013-05-24 12:23:06 -07:00
The Android Automerger e30590f90a JWR53D 2013-05-23 22:09:57 -07:00
The Android Automerger e4f52fb70a JWR53C 2013-05-23 19:58:17 -07:00
The Android Automerger 2803c67c42 JWR53B 2013-05-23 14:35:29 -07:00