OSDN Git Service

android-x86/build.git
11 years agoJOP17B
The Android Automerger [Wed, 17 Oct 2012 17:56:30 +0000 (10:56 -0700)]
JOP17B

11 years agoJOP17
The Android Automerger [Wed, 17 Oct 2012 14:00:47 +0000 (07:00 -0700)]
JOP17

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 17 Oct 2012 13:59:07 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoJOP16B
The Android Automerger [Wed, 17 Oct 2012 00:32:17 +0000 (17:32 -0700)]
JOP16B

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 17 Oct 2012 00:30:07 +0000 (17:30 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoJOP16
The Android Automerger [Tue, 16 Oct 2012 14:01:45 +0000 (07:01 -0700)]
JOP16

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 16 Oct 2012 13:59:07 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoJOP15
The Android Automerger [Mon, 15 Oct 2012 14:00:37 +0000 (07:00 -0700)]
JOP15

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Mon, 15 Oct 2012 13:59:06 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoJOP14
The Android Automerger [Sun, 14 Oct 2012 13:59:49 +0000 (06:59 -0700)]
JOP14

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sun, 14 Oct 2012 13:59:03 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoJOP13
The Android Automerger [Sat, 13 Oct 2012 22:37:39 +0000 (15:37 -0700)]
JOP13

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sat, 13 Oct 2012 22:36:55 +0000 (15:36 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoJOP12D
The Android Automerger [Sat, 13 Oct 2012 10:50:53 +0000 (03:50 -0700)]
JOP12D

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sat, 13 Oct 2012 10:49:55 +0000 (03:49 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoMerge "DO NOT MERGE: better late than never: fix build id for JB MR1" into jb-mr1-dev
Guang Zhu [Sat, 13 Oct 2012 00:04:57 +0000 (17:04 -0700)]
Merge "DO NOT MERGE: better late than never: fix build id for JB MR1" into jb-mr1-dev

11 years agoJOP12C
The Android Automerger [Fri, 12 Oct 2012 23:33:40 +0000 (16:33 -0700)]
JOP12C

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Fri, 12 Oct 2012 23:32:31 +0000 (16:32 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoJOP12B
The Android Automerger [Fri, 12 Oct 2012 18:50:51 +0000 (11:50 -0700)]
JOP12B

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Fri, 12 Oct 2012 18:49:45 +0000 (11:49 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoJOP12
The Android Automerger [Fri, 12 Oct 2012 14:00:22 +0000 (07:00 -0700)]
JOP12

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Fri, 12 Oct 2012 13:59:06 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoMerge "Delete the unused LOCAL_POST_PROCESS_COMMAND." into jb-mr1-dev
Ying Wang [Fri, 12 Oct 2012 01:01:17 +0000 (18:01 -0700)]
Merge "Delete the unused LOCAL_POST_PROCESS_COMMAND." into jb-mr1-dev

11 years agoDelete the unused LOCAL_POST_PROCESS_COMMAND.
Ying Wang [Fri, 12 Oct 2012 00:26:07 +0000 (17:26 -0700)]
Delete the unused LOCAL_POST_PROCESS_COMMAND.

Change-Id: I77785dff6c7b2236880232522d6ed5bc01d5f0ce

11 years agoMerge "Add support for building Filterscript files." into jb-mr1-dev
Stephen Hines [Fri, 12 Oct 2012 00:25:20 +0000 (17:25 -0700)]
Merge "Add support for building Filterscript files." into jb-mr1-dev

11 years agoam 77b10b6a: am e37b7a52: am 8f20607c: Doc change: add new items to qv and adjust...
Dirk Dougherty [Thu, 11 Oct 2012 23:57:43 +0000 (16:57 -0700)]
am 77b10b6a: am e37b7a52: am 8f20607c: Doc change: add new items to qv and adjust height.

* commit '77b10b6a78f8ef77e2d5bbb3cb650f953c642527':
  Doc change: add new items to qv and adjust height.

11 years agoJOP11B
The Android Automerger [Thu, 11 Oct 2012 23:27:47 +0000 (16:27 -0700)]
JOP11B

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Thu, 11 Oct 2012 23:26:14 +0000 (16:26 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam e37b7a52: am 8f20607c: Doc change: add new items to qv and adjust height.
Dirk Dougherty [Thu, 11 Oct 2012 22:33:05 +0000 (15:33 -0700)]
am e37b7a52: am 8f20607c: Doc change: add new items to qv and adjust height.

* commit 'e37b7a52abb488f853fefa1a13eec1b5c20844a6':
  Doc change: add new items to qv and adjust height.

11 years agoam 8f20607c: Doc change: add new items to qv and adjust height.
Dirk Dougherty [Thu, 11 Oct 2012 22:31:29 +0000 (15:31 -0700)]
am 8f20607c: Doc change: add new items to qv and adjust height.

* commit '8f20607ccb9c41469eec8f1f481d8d841bbeb2a1':
  Doc change: add new items to qv and adjust height.

11 years agoDoc change: add new items to qv and adjust height.
Dirk Dougherty [Mon, 8 Oct 2012 20:14:17 +0000 (13:14 -0700)]
Doc change: add new items to qv and adjust height.

Change-Id: I246c36e0aabb32264325e0943aed127419da2a73

11 years agoAdd support for building Filterscript files.
Stephen Hines [Thu, 11 Oct 2012 22:01:53 +0000 (15:01 -0700)]
Add support for building Filterscript files.

This change piggybacks Filterscript rules onto the existing Renderscript
rules. There is no real difference other than the file extension (which
llvm-rs-cc uses to apply a more stringent set of warnings/errors).

Bug: 7166741
Change-Id: I27175ff1c16c27129cafa92b4e8caabf2e5f4150

11 years agoResovle symlink in findmakefiles in envsetup.sh
Ying Wang [Thu, 11 Oct 2012 22:05:07 +0000 (15:05 -0700)]
Resovle symlink in findmakefiles in envsetup.sh

So the returned path can match the one returned by gettop,
and so we can get the correct relative path of ONE_SHOT_MAKEFILE when running mm.

Change-Id: I492d68fec47e59ec9f4ea0fb5139b1a28af0f6cd

11 years agoConvert to relative path for CleanSpec.mk
Ying Wang [Thu, 11 Oct 2012 18:53:04 +0000 (11:53 -0700)]
Convert to relative path for CleanSpec.mk

When using mm, which passes in absolute path, while in full build relative
paths are used to encode clean steps.

Change-Id: I3e39ce3125194589f9a464f27eef4a9c96fa06c1

11 years agoJOP11
The Android Automerger [Thu, 11 Oct 2012 14:05:02 +0000 (07:05 -0700)]
JOP11

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Thu, 11 Oct 2012 13:59:07 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoJOP10E
The Android Automerger [Thu, 11 Oct 2012 02:21:32 +0000 (19:21 -0700)]
JOP10E

11 years agoMerge "Add the new 'settings' shell tool to the build" into jb-mr1-dev
Christopher Tate [Wed, 10 Oct 2012 22:35:00 +0000 (15:35 -0700)]
Merge "Add the new 'settings' shell tool to the build" into jb-mr1-dev

11 years agoAdd the new 'settings' shell tool to the build
Christopher Tate [Wed, 10 Oct 2012 21:13:59 +0000 (14:13 -0700)]
Add the new 'settings' shell tool to the build

The tool isn't useful unless it's actually built into products.

Bug 7299066

Change-Id: I9aaf37bde73a986d871eac6fd4dea15c192110cb

11 years agoJOP10D
The Android Automerger [Wed, 10 Oct 2012 21:08:03 +0000 (14:08 -0700)]
JOP10D

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 10 Oct 2012 21:06:21 +0000 (14:06 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoSupport to build executables against the NDK
Ying Wang [Wed, 26 Sep 2012 00:52:10 +0000 (17:52 -0700)]
Support to build executables against the NDK

Use "LOCAL_SDK_VERSION := <number>" to build against the NDK when you
include $(BUILD_EXECUTABLE).
Cherry-picked from master.

Bug: 7170098
Change-Id: Ib35a294bd6aa4e969d46ecd8ebab8ca5d843e24b

11 years agoJOP10C
The Android Automerger [Wed, 10 Oct 2012 16:58:54 +0000 (09:58 -0700)]
JOP10C

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 10 Oct 2012 16:58:25 +0000 (09:58 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoJOP10B
The Android Automerger [Wed, 10 Oct 2012 16:52:55 +0000 (09:52 -0700)]
JOP10B

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 10 Oct 2012 16:51:58 +0000 (09:51 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoJOP10
The Android Automerger [Wed, 10 Oct 2012 14:00:50 +0000 (07:00 -0700)]
JOP10

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 10 Oct 2012 13:59:08 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoJOP09D
The Android Automerger [Wed, 10 Oct 2012 05:59:46 +0000 (22:59 -0700)]
JOP09D

11 years agoDO NOT MERGE: better late than never: fix build id for JB MR1
Guang Zhu [Wed, 10 Oct 2012 01:39:40 +0000 (18:39 -0700)]
DO NOT MERGE: better late than never: fix build id for JB MR1

Change-Id: Iaad3002693af683f719832d3c082e7e4dcbf8d29

11 years agoJOP09C
The Android Automerger [Wed, 10 Oct 2012 00:54:34 +0000 (17:54 -0700)]
JOP09C

11 years agoJOP09B
The Android Automerger [Tue, 9 Oct 2012 23:10:49 +0000 (16:10 -0700)]
JOP09B

11 years agoJOP08
The Android Automerger [Tue, 9 Oct 2012 23:07:43 +0000 (16:07 -0700)]
JOP08

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 9 Oct 2012 23:07:18 +0000 (16:07 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoJOP08wq!
The Android Automerger [Tue, 9 Oct 2012 23:01:50 +0000 (16:01 -0700)]
JOP08wq!

11 years agoJOP09
The Android Automerger [Tue, 9 Oct 2012 14:00:54 +0000 (07:00 -0700)]
JOP09

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 9 Oct 2012 13:59:06 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoJOP08B
The Android Automerger [Mon, 8 Oct 2012 23:08:35 +0000 (16:08 -0700)]
JOP08B

11 years agoam b282c359: am 126c5e92: am e6850d2d: fix layout bug on API Guide landing pages
Scott Main [Mon, 8 Oct 2012 23:06:43 +0000 (16:06 -0700)]
am b282c359: am 126c5e92: am e6850d2d: fix layout bug on API Guide landing pages

* commit 'b282c359fcbde7f36b579cde388ca044a0dd6d60':
  fix layout bug on API Guide landing pages

11 years agoam 126c5e92: am e6850d2d: fix layout bug on API Guide landing pages
Scott Main [Mon, 8 Oct 2012 23:04:25 +0000 (16:04 -0700)]
am 126c5e92: am e6850d2d: fix layout bug on API Guide landing pages

* commit '126c5e9205263f097af4d0f9dca3b10c9a02d72b':
  fix layout bug on API Guide landing pages

11 years agoam e6850d2d: fix layout bug on API Guide landing pages
Scott Main [Mon, 8 Oct 2012 23:02:05 +0000 (16:02 -0700)]
am e6850d2d: fix layout bug on API Guide landing pages

* commit 'e6850d2db787a4e268b5cee57d74e9308180a589':
  fix layout bug on API Guide landing pages

11 years agofix layout bug on API Guide landing pages
Scott Main [Mon, 8 Oct 2012 22:59:01 +0000 (15:59 -0700)]
fix layout bug on API Guide landing pages

Change-Id: Ic757d26c29cd06c33dc62816698b68a9b5fe869a

11 years agoJOP08
The Android Automerger [Mon, 8 Oct 2012 14:00:04 +0000 (07:00 -0700)]
JOP08

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Mon, 8 Oct 2012 13:59:05 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoJOP07D
The Android Automerger [Mon, 8 Oct 2012 01:59:00 +0000 (18:59 -0700)]
JOP07D

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Mon, 8 Oct 2012 01:57:48 +0000 (18:57 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoJOP07C
The Android Automerger [Sun, 7 Oct 2012 23:06:32 +0000 (16:06 -0700)]
JOP07C

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sun, 7 Oct 2012 23:05:02 +0000 (16:05 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoJOP07B
The Android Automerger [Sun, 7 Oct 2012 22:05:44 +0000 (15:05 -0700)]
JOP07B

11 years agoJOP07
The Android Automerger [Sun, 7 Oct 2012 14:00:38 +0000 (07:00 -0700)]
JOP07

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Sun, 7 Oct 2012 13:59:05 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoJOP05E
The Android Automerger [Sat, 6 Oct 2012 07:39:03 +0000 (00:39 -0700)]
JOP05E

11 years agoJOP05D
The Android Automerger [Sat, 6 Oct 2012 00:28:51 +0000 (17:28 -0700)]
JOP05D

11 years agoJOP05C
The Android Automerger [Fri, 5 Oct 2012 22:09:28 +0000 (15:09 -0700)]
JOP05C

11 years agoadd mip32 stuffs to clang's unknown flag list
Keun young Park [Fri, 5 Oct 2012 20:26:19 +0000 (13:26 -0700)]
add mip32 stuffs to clang's unknown flag list

- mini_mips changed to mips32-fp to accomodate all mips variants

Bug: 7294949
Change-Id: Iae759e10e3f5d255e27b688042477263438bb7a7

11 years agoJOP05B
The Android Automerger [Fri, 5 Oct 2012 19:32:34 +0000 (12:32 -0700)]
JOP05B

11 years agoJOP05
The Android Automerger [Fri, 5 Oct 2012 14:01:14 +0000 (07:01 -0700)]
JOP05

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Fri, 5 Oct 2012 13:59:13 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoJOP04C
The Android Automerger [Thu, 4 Oct 2012 23:58:19 +0000 (16:58 -0700)]
JOP04C

11 years agoJOP04B
The Android Automerger [Thu, 4 Oct 2012 21:22:52 +0000 (14:22 -0700)]
JOP04B

11 years agoMerge "Store vendor module owner info on the build server." into jb-mr1-dev
Ying Wang [Thu, 4 Oct 2012 17:01:14 +0000 (10:01 -0700)]
Merge "Store vendor module owner info on the build server." into jb-mr1-dev

11 years agoJOP04
The Android Automerger [Thu, 4 Oct 2012 14:01:31 +0000 (07:01 -0700)]
JOP04

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Thu, 4 Oct 2012 13:59:12 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoStore vendor module owner info on the build server.
Ying Wang [Wed, 3 Oct 2012 22:22:51 +0000 (15:22 -0700)]
Store vendor module owner info on the build server.

Bug: 7048854
Change-Id: I5f0653c71a77774978655f8b5570e170b4a9c4ec

11 years agoam ded6dc01: am 86028756: am 46c5804c: add analytics tracking event for sdk/ndk downloads
Scott Main [Thu, 4 Oct 2012 00:41:59 +0000 (17:41 -0700)]
am ded6dc01: am 86028756: am 46c5804c: add analytics tracking event for sdk/ndk downloads

* commit 'ded6dc0137fb0632f9de47870fb923567ea22b17':
  add analytics tracking event for sdk/ndk downloads

11 years agoam 86028756: am 46c5804c: add analytics tracking event for sdk/ndk downloads
Scott Main [Thu, 4 Oct 2012 00:40:45 +0000 (17:40 -0700)]
am 86028756: am 46c5804c: add analytics tracking event for sdk/ndk downloads

* commit '860287560db20e6f46a282284d8a04d5e001d2ea':
  add analytics tracking event for sdk/ndk downloads

11 years agoam 46c5804c: add analytics tracking event for sdk/ndk downloads
Scott Main [Thu, 4 Oct 2012 00:38:56 +0000 (17:38 -0700)]
am 46c5804c: add analytics tracking event for sdk/ndk downloads

* commit '46c5804c47e02206a4c97c0890991c2d3bff87bf':
  add analytics tracking event for sdk/ndk downloads

11 years agoadd analytics tracking event for sdk/ndk downloads
Scott Main [Wed, 3 Oct 2012 23:34:52 +0000 (16:34 -0700)]
add analytics tracking event for sdk/ndk downloads

Change-Id: Icb04694ef9498ae684350ad4a971fb23d0301605

11 years agoJOP03B
The Android Automerger [Wed, 3 Oct 2012 23:00:28 +0000 (16:00 -0700)]
JOP03B

11 years agoJOP03
The Android Automerger [Wed, 3 Oct 2012 14:01:14 +0000 (07:01 -0700)]
JOP03

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 3 Oct 2012 13:59:14 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam 55b19bdd: am 9341d398: am a4888dc8: adjust position of prev/next links at bottom...
Scott Main [Wed, 3 Oct 2012 06:32:42 +0000 (23:32 -0700)]
am 55b19bdd: am 9341d398: am a4888dc8: adjust position of prev/next links at bottom of page to account for russian string length

* commit '55b19bddcc6dfe750a1df70fe9955a42701f0007':
  adjust position of prev/next links at bottom of page to account for russian string length

11 years agoam 9341d398: am a4888dc8: adjust position of prev/next links at bottom of page to...
Scott Main [Wed, 3 Oct 2012 06:31:34 +0000 (23:31 -0700)]
am 9341d398: am a4888dc8: adjust position of prev/next links at bottom of page to account for russian string length

* commit '9341d398a87fd9679366fafbbc398601c4c01de4':
  adjust position of prev/next links at bottom of page to account for russian string length

11 years agoam a4888dc8: adjust position of prev/next links at bottom of page to account for...
Scott Main [Wed, 3 Oct 2012 06:30:35 +0000 (23:30 -0700)]
am a4888dc8: adjust position of prev/next links at bottom of page to account for russian string length

* commit 'a4888dc8657c46ff3fec9ae2e840432255d40a88':
  adjust position of prev/next links at bottom of page to account for russian string length

11 years agoadjust position of prev/next links at bottom of page to account for russian string...
Scott Main [Wed, 3 Oct 2012 06:25:21 +0000 (23:25 -0700)]
adjust position of prev/next links at bottom of page to account for russian string length

Change-Id: I450a11e49fb16bb9e30140d78b190d06b39e1b13

11 years agoam 83fca03d: (-s ours) am 5150b1f7: am f3d0104a: (-s ours) DO NOT MERGE cherrypick...
Scott Main [Wed, 3 Oct 2012 04:07:42 +0000 (21:07 -0700)]
am 83fca03d: (-s ours) am 5150b1f7: am f3d0104a: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800

* commit '83fca03d080b88d5ecda75f6c5b5a1f44fa25d8f':
  DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800

11 years agoam c914b5bf: (-s ours) am 142158bd: am 6eb95f1a: (-s ours) DO NOT MERGE cherypick...
Scott Main [Wed, 3 Oct 2012 04:07:40 +0000 (21:07 -0700)]
am c914b5bf: (-s ours) am 142158bd: am 6eb95f1a: (-s ours) DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73

* commit 'c914b5bf5224f2d5fcc24026c35c2e4ffd7588d7':
  DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73

11 years agoam 5150b1f7: am f3d0104a: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id...
Scott Main [Wed, 3 Oct 2012 04:05:26 +0000 (21:05 -0700)]
am 5150b1f7: am f3d0104a: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800

* commit '5150b1f770301f5359c07da1be5ce0fdaf342ba9':
  DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800

11 years agoam 142158bd: am 6eb95f1a: (-s ours) DO NOT MERGE cherypick from jb-dev Change-Id...
Scott Main [Wed, 3 Oct 2012 04:05:25 +0000 (21:05 -0700)]
am 142158bd: am 6eb95f1a: (-s ours) DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73

* commit '142158bd218421741d6d133e9ebbb1203ae6e6a6':
  DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73

11 years agoam f3d0104a: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a...
Scott Main [Wed, 3 Oct 2012 04:04:28 +0000 (21:04 -0700)]
am f3d0104a: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800

* commit 'f3d0104a8039af22daab02a914c6639fe078c9a6':
  DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800