git.osdn.net Git - android-x86/build.git/log

Ben Cheng [Fri, 16 Nov 2012 21:29:13 +0000 (13:29 -0800)]

[ARM] Extend the usage of TARGET_GCC_VERSION for gdb and arm-eabi-*.

In the future to upgrade the gcc version we just need to edit one
line in core/config.mk.

Change-Id: I01bb38c38f2388913bb7369aa4b2da480411dfbe

commit | commitdiff | tree

Ying Wang [Mon, 12 Nov 2012 22:45:59 +0000 (14:45 -0800)]

am 865d851a: Merge "Remove the obsolete comments and change the misleading var name."

* commit '865d851a8012e13c35d573d98770b7187d32b7f7':
Remove the obsolete comments and change the misleading var name.

commit | commitdiff | tree

Ying Wang [Mon, 12 Nov 2012 22:34:24 +0000 (14:34 -0800)]

Merge "Remove the obsolete comments and change the misleading var name."

commit | commitdiff | tree

Ying Wang [Mon, 12 Nov 2012 22:31:20 +0000 (14:31 -0800)]

Remove the obsolete comments and change the misleading var name.

Change-Id: Ib19099cbce0133f5c7df44fa0fd80215809a1ad8

commit | commitdiff | tree

Andrew Hsieh [Mon, 12 Nov 2012 20:50:03 +0000 (12:50 -0800)]

resolved conflicts for merge of 8b3ce5a3 to stage-aosp-master

Change-Id: I588a055812ddc8f4531c9d02994beb366f9aab3e

commit | commitdiff | tree

Andrew Hsieh [Mon, 12 Nov 2012 19:28:10 +0000 (11:28 -0800)]

Merge "Use prebuilt gcc for MacOSX"

commit | commitdiff | tree

Andrew Hsieh [Sat, 10 Nov 2012 05:12:02 +0000 (21:12 -0800)]

Use prebuilt gcc for MacOSX

1. Use prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1
   See https://android-review.googlesource.com/#/c/46223/
2. Rewrite logic dealing with mac_sdk_version to support all
   MacOSX SDK 10.6, 10.7 and 10.8.  Note that since
   ad2342375963c2468849c1f83a97158383db6511 emulator no longer
   depends on 10.6 to build.  Since the lowest SDK among intersection
   of the "available" and the "supported" SDKs is picked, add a
   new variable MAC_SDK_VERSION for developer really want to overwrite
   it.  MAC_SDK_VERSION still has to be one of the supported, though.
3. Improve mac_sdk_path detection to deal with case where Xcode
   *dmg is mounted only, not installed at /Applications.
4. Now we can retire BUILD_MAC_SDK_EXPERIMENTAL

Change-Id: I83e463556a857d527710f766de0e19e1b576151f

commit | commitdiff | tree

The Android Open Source Project [Mon, 12 Nov 2012 15:31:11 +0000 (07:31 -0800)]

am daa3e04e: am 2e939805: Reconcile with jb-mr1-release - do not merge

* commit 'daa3e04e485a037b38ff0d97a04fb1e0d139b143':
JOP40C
JOP40B

commit | commitdiff | tree

The Android Open Source Project [Mon, 12 Nov 2012 15:28:31 +0000 (07:28 -0800)]

am 2e939805: Reconcile with jb-mr1-release - do not merge

* commit '2e939805afafebced02bc3ed027807291ddd5dc4':
JOP40C
JOP40B

commit | commitdiff | tree

The Android Open Source Project [Mon, 12 Nov 2012 15:26:05 +0000 (07:26 -0800)]

Reconcile with jb-mr1-release - do not merge

Change-Id: Ie852ca3761e50d4e84e554572faa3920e1880821

commit | commitdiff | tree

The Android Automerger [Sat, 10 Nov 2012 06:51:38 +0000 (22:51 -0800)]

JOP40C

commit | commitdiff | tree

The Android Open Source Project [Sat, 10 Nov 2012 06:41:18 +0000 (22:41 -0800)]

am 976a70c4: am 5194366b: Reconcile with jb-mr1-release - do not merge

* commit '976a70c41ec0dd6f283c1bec8b2c0c15deb373c0':
JOP40

commit | commitdiff | tree

The Android Automerger [Sat, 10 Nov 2012 00:25:54 +0000 (16:25 -0800)]

JOP40B

commit | commitdiff | tree

The Android Automerger [Sat, 10 Nov 2012 00:25:12 +0000 (16:25 -0800)]

merge in jb-mr1-release history after reset to jb-mr1-dev

commit | commitdiff | tree

The Android Open Source Project [Fri, 9 Nov 2012 21:09:05 +0000 (13:09 -0800)]

am 5194366b: Reconcile with jb-mr1-release - do not merge

* commit '5194366bcdb91d5908c8db50f002a891fe8b8bde':
JOP40

commit | commitdiff | tree

The Android Open Source Project [Fri, 9 Nov 2012 21:07:03 +0000 (13:07 -0800)]

Reconcile with jb-mr1-release - do not merge

Change-Id: I482192b20bde4fcc55f9a781e37256d396c2c9fb

commit | commitdiff | tree

The Android Automerger [Fri, 9 Nov 2012 20:51:06 +0000 (12:51 -0800)]

JOP40

commit | commitdiff | tree

The Android Automerger [Fri, 9 Nov 2012 20:50:33 +0000 (12:50 -0800)]

merge in jb-mr1-release history after reset to jb-mr1-dev

commit | commitdiff | tree

Andrew Hsieh [Fri, 9 Nov 2012 18:28:36 +0000 (10:28 -0800)]

am 2ea957a3: Merge "Revise checks for MacOSX to build emulator"

* commit '2ea957a373018ba6773c621065164256f0d84078':
Revise checks for MacOSX to build emulator

commit | commitdiff | tree

Andrew Hsieh [Fri, 9 Nov 2012 17:33:38 +0000 (09:33 -0800)]

Merge "Revise checks for MacOSX to build emulator"

commit | commitdiff | tree

Jean-Baptiste Queru [Fri, 9 Nov 2012 15:46:14 +0000 (07:46 -0800)]

Version number for AOSP master - do not merge

Change-Id: I67dab0de027ab458de326375a3f8077594f702cb

commit | commitdiff | tree

The Android Open Source Project [Fri, 9 Nov 2012 15:24:03 +0000 (07:24 -0800)]

am 0f4d2683: am 79ab2553: Reconcile with jb-mr1-release - do not merge

* commit '0f4d268311249113eeaf937dbe51ad2d94c7063f':
JOP39B

commit | commitdiff | tree

The Android Open Source Project [Fri, 9 Nov 2012 15:22:04 +0000 (07:22 -0800)]

am 79ab2553: Reconcile with jb-mr1-release - do not merge

* commit '79ab2553a77c0f111e990e3aec342ce0cde87fc9':
JOP39B

commit | commitdiff | tree

The Android Open Source Project [Fri, 9 Nov 2012 15:19:14 +0000 (07:19 -0800)]

Reconcile with jb-mr1-release - do not merge

Change-Id: I5d3a0c41a1626bdf59f75cd8d989d0d725fc4680

commit | commitdiff | tree

Andrew Hsieh [Fri, 9 Nov 2012 10:06:33 +0000 (02:06 -0800)]

Revise checks for MacOSX to build emulator

1. Check $(HOST_CC) instead of gcc for llvm-gcc.
2. Remvoe Mac SDK 10.4 check because emulator uses
the same SDK version as the rest of framework

Change-Id: I4071fd45dc09a18c5341ad79e6a85e61df060fb4

commit | commitdiff | tree

The Android Automerger [Fri, 9 Nov 2012 01:53:45 +0000 (17:53 -0800)]

JOP39B

commit | commitdiff | tree

The Android Automerger [Fri, 9 Nov 2012 01:53:10 +0000 (17:53 -0800)]

merge in jb-mr1-release history after reset to jb-mr1-dev

commit | commitdiff | tree

The Android Open Source Project [Thu, 8 Nov 2012 23:47:51 +0000 (15:47 -0800)]

am 36f9ca38: am 17e06817: Reconcile with jb-mr1-release - do not merge

* commit '36f9ca38266580c7bdac9c83a03a2b60daddf3a9':
JOP39

commit | commitdiff | tree

The Android Open Source Project [Thu, 8 Nov 2012 23:44:29 +0000 (15:44 -0800)]

am a6f37679: am d84f0294: Reconcile with jb-mr1-release - do not merge

* commit 'a6f376792eb8910ee4a76d59b48ebe5fcd2f4aec':
JOP38C
JOP38B

commit | commitdiff | tree

Ying Wang [Thu, 8 Nov 2012 23:43:13 +0000 (15:43 -0800)]

am f99f5e89: am d0b1977f: am 0138951e: Collapse multiple --extra-packages into one.

* commit 'f99f5e89a15cada28dc692a5a7ce3413bdd965b4':
Collapse multiple --extra-packages into one.

commit | commitdiff | tree

The Android Open Source Project [Thu, 8 Nov 2012 23:42:13 +0000 (15:42 -0800)]

am 151c3655: am ab529f13: Reconcile with jb-mr1-release - do not merge

* commit '151c3655cb63111b47cff4a297f738bab9c567a2':
JOP38

commit | commitdiff | tree

The Android Open Source Project [Thu, 8 Nov 2012 22:20:58 +0000 (14:20 -0800)]

am 17e06817: Reconcile with jb-mr1-release - do not merge

* commit '17e06817a22f2a13baddec627dbf385d8799a604':
JOP39

commit | commitdiff | tree

The Android Open Source Project [Thu, 8 Nov 2012 22:18:55 +0000 (14:18 -0800)]

Reconcile with jb-mr1-release - do not merge

Change-Id: I1ff0e098597e9de600fbec6b6661206e66a72afc

commit | commitdiff | tree

The Android Automerger [Thu, 8 Nov 2012 21:54:33 +0000 (13:54 -0800)]

JOP39

commit | commitdiff | tree

The Android Automerger [Thu, 8 Nov 2012 21:53:50 +0000 (13:53 -0800)]

merge in jb-mr1-release history after reset to jb-mr1-dev

commit | commitdiff | tree

The Android Open Source Project [Thu, 8 Nov 2012 16:56:04 +0000 (08:56 -0800)]

am d84f0294: Reconcile with jb-mr1-release - do not merge

* commit 'd84f02944f78595c3f72eb7e8bc422c63bd6ce89':
JOP38C
JOP38B

commit | commitdiff | tree

The Android Open Source Project [Thu, 8 Nov 2012 16:54:06 +0000 (08:54 -0800)]

Reconcile with jb-mr1-release - do not merge

Change-Id: I0f7fd29de4c05e6b8298814e03ea681699117fae

commit | commitdiff | tree

The Android Open Source Project [Thu, 8 Nov 2012 14:26:55 +0000 (06:26 -0800)]

am c66e994c: am b791a5fb: Reconcile with jb-mr1-release - do not merge

* commit 'c66e994c3b0609eca4fa33d95cdf6fbae44ae128':
JOP37B

commit | commitdiff | tree

Xavier Ducrohet [Thu, 8 Nov 2012 14:14:19 +0000 (06:14 -0800)]

am 62c12cc5: am 83c3110c: am 1818ea8a: Add dev settings to emulator.

* commit '62c12cc5eb331c560cef3daf8121ae938c3e4ab0':
Add dev settings to emulator.

commit | commitdiff | tree

The Android Open Source Project [Thu, 8 Nov 2012 14:12:37 +0000 (06:12 -0800)]

am 43b91298: am 34d12aaf: Reconcile with jb-mr1-release - do not merge

* commit '43b912989f6cddca820e98ff29dcedf83a89ddde':
JOP37

commit | commitdiff | tree

Elliott Hughes [Thu, 8 Nov 2012 02:31:35 +0000 (18:31 -0800)]

am ef9744f7: Merge "Remove manual WITH_JIT setting from build/."

* commit 'ef9744f7ee4fd2315f41c58ba48906d9d79363dd':
Remove manual WITH_JIT setting from build/.

commit | commitdiff | tree

Elliott Hughes [Thu, 8 Nov 2012 02:24:42 +0000 (18:24 -0800)]

Merge "Remove manual WITH_JIT setting from build/."

commit | commitdiff | tree

The Android Automerger [Thu, 8 Nov 2012 02:05:21 +0000 (18:05 -0800)]

JOP38C

commit | commitdiff | tree

The Android Automerger [Thu, 8 Nov 2012 02:04:33 +0000 (18:04 -0800)]

merge in jb-mr1-release history after reset to jb-mr1-dev

commit | commitdiff | tree

Ying Wang [Thu, 8 Nov 2012 00:33:08 +0000 (16:33 -0800)]

am d0b1977f: am 0138951e: Collapse multiple --extra-packages into one.

* commit 'd0b1977f7d12736a99a99893061948c622b5d8f3':
Collapse multiple --extra-packages into one.

commit | commitdiff | tree

Ying Wang [Thu, 8 Nov 2012 00:30:24 +0000 (16:30 -0800)]

am 0138951e: Collapse multiple --extra-packages into one.

* commit '0138951eaffaeaf32f8376959074aabf4ecfaff1':
Collapse multiple --extra-packages into one.

commit | commitdiff | tree

Ying Wang [Wed, 7 Nov 2012 22:07:34 +0000 (14:07 -0800)]

Collapse multiple --extra-packages into one.

Change-Id: Icbdd56fa104c03e0a6cc58e441e60286a7f25bb2

commit | commitdiff | tree

The Android Automerger [Wed, 7 Nov 2012 21:06:35 +0000 (13:06 -0800)]

JOP38B

commit | commitdiff | tree

The Android Automerger [Wed, 7 Nov 2012 21:05:41 +0000 (13:05 -0800)]

merge in jb-mr1-release history after reset to jb-mr1-dev

commit | commitdiff | tree

The Android Open Source Project [Wed, 7 Nov 2012 19:37:19 +0000 (11:37 -0800)]

am ab529f13: Reconcile with jb-mr1-release - do not merge

* commit 'ab529f13368a07e619f7aa2147164eeca91144db':
JOP38

commit | commitdiff | tree

The Android Open Source Project [Wed, 7 Nov 2012 19:35:01 +0000 (11:35 -0800)]

Reconcile with jb-mr1-release - do not merge

Change-Id: I6b6342bf7e65019d9efeb2ff138ffb728bbef063

commit | commitdiff | tree

The Android Automerger [Wed, 7 Nov 2012 19:18:45 +0000 (11:18 -0800)]

JOP38

commit | commitdiff | tree

The Android Automerger [Wed, 7 Nov 2012 19:17:50 +0000 (11:17 -0800)]

merge in jb-mr1-release history after reset to jb-mr1-dev

commit | commitdiff | tree

The Android Open Source Project [Wed, 7 Nov 2012 18:22:10 +0000 (10:22 -0800)]

am b791a5fb: Reconcile with jb-mr1-release - do not merge

* commit 'b791a5fb7930e8ad8108e59fb87b6183e516a382':
JOP37B

commit | commitdiff | tree

The Android Open Source Project [Wed, 7 Nov 2012 18:19:36 +0000 (10:19 -0800)]

Reconcile with jb-mr1-release - do not merge

Change-Id: Ie6ab54e92b8261bc8b2fb8819e73631237a04e84

commit | commitdiff | tree

The Android Automerger [Wed, 7 Nov 2012 02:04:47 +0000 (18:04 -0800)]

JOP37B

commit | commitdiff | tree

The Android Automerger [Wed, 7 Nov 2012 02:03:47 +0000 (18:03 -0800)]

merge in jb-mr1-release history after reset to jb-mr1-dev

commit | commitdiff | tree

Xavier Ducrohet [Wed, 7 Nov 2012 01:11:58 +0000 (17:11 -0800)]

am 83c3110c: am 1818ea8a: Add dev settings to emulator.

* commit '83c3110c401fc21f6b4a47db7e9732a7b0d00e9b':
Add dev settings to emulator.

commit | commitdiff | tree

Xavier Ducrohet [Wed, 7 Nov 2012 01:09:17 +0000 (17:09 -0800)]

am 1818ea8a: Add dev settings to emulator.

* commit '1818ea8ae0f49a8c4c24413034dcd3fc34d80414':
Add dev settings to emulator.

commit | commitdiff | tree

Xavier Ducrohet [Wed, 7 Nov 2012 01:03:52 +0000 (17:03 -0800)]

Add dev settings to emulator.

Change-Id: I0f92257c0a6ac92f3bce4ad004c3e2414ef0f9da

commit | commitdiff | tree

Elliott Hughes [Wed, 7 Nov 2012 00:41:52 +0000 (16:41 -0800)]

Remove manual WITH_JIT setting from build/.

This is now done automatically by dalvik/, since
patch 272a54f8553e13b87bf819542ddc6701fc1232cc.

Change-Id: I57709538f20188417c014630442e897401d7ace0

commit | commitdiff | tree

The Android Open Source Project [Tue, 6 Nov 2012 21:29:14 +0000 (13:29 -0800)]

am 34d12aaf: Reconcile with jb-mr1-release - do not merge

* commit '34d12aaf7ab9162fe891458d45a130e93e9cbc34':
JOP37

commit | commitdiff | tree

The Android Open Source Project [Tue, 6 Nov 2012 21:26:37 +0000 (13:26 -0800)]

Reconcile with jb-mr1-release - do not merge

Change-Id: I2c8f0cf7f655c624f2c72ed967dba6b071e8fe6e

commit | commitdiff | tree

The Android Automerger [Tue, 6 Nov 2012 21:14:19 +0000 (13:14 -0800)]

JOP37

commit | commitdiff | tree

The Android Automerger [Tue, 6 Nov 2012 21:13:17 +0000 (13:13 -0800)]

merge in jb-mr1-release history after reset to jb-mr1-dev

commit | commitdiff | tree

The Android Open Source Project [Tue, 6 Nov 2012 20:37:06 +0000 (12:37 -0800)]

Reconcile with jb-mr1.1-release - do not merge

Change-Id: I2b61fb6935acf60f683171f9639c658088b259f5

commit | commitdiff | tree

The Android Open Source Project [Tue, 6 Nov 2012 19:06:16 +0000 (11:06 -0800)]

am 5d0f94aa: am 25e3f428: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '5d0f94aa25d5e72fccd3b0d3ed3ecd4855b0e963':
JOP36

commit | commitdiff | tree

The Android Open Source Project [Tue, 6 Nov 2012 19:03:23 +0000 (11:03 -0800)]

am 25e3f428: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '25e3f42871569d5801082825b48c60330d9b60e0': (239 commits)
  JOP36
  JOP34
  JOP33
  JOP32C
  JOP32B
  JOP32
  JOP31
  JOP30C
  JOP30B
  JOP30
  JOP29
  JOP26B
  JOP26
  JOP24G
  JOP24F
  JOP24E
  JOP24D
  JOP24C
  JOP24B
  JVP15S
  ...

commit | commitdiff | tree

The Android Open Source Project [Tue, 6 Nov 2012 16:49:43 +0000 (08:49 -0800)]

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Ie4f29093944bea7faa6eb3b3afaf098336c761ba

commit | commitdiff | tree

The Android Automerger [Tue, 6 Nov 2012 10:51:08 +0000 (02:51 -0800)]

JDP37

commit | commitdiff | tree

The Android Automerger [Tue, 6 Nov 2012 10:13:23 +0000 (02:13 -0800)]

merge in jb-mr1.1-release history after reset to jb-mr1.1-dev

commit | commitdiff | tree

The Android Automerger [Tue, 6 Nov 2012 02:40:05 +0000 (18:40 -0800)]

JOP36

commit | commitdiff | tree

The Android Automerger [Tue, 6 Nov 2012 02:38:31 +0000 (18:38 -0800)]

merge in jb-mr1-release history after reset to jb-mr1-dev

commit | commitdiff | tree

The Android Open Source Project [Mon, 5 Nov 2012 15:55:49 +0000 (07:55 -0800)]

Reconcile with jb-mr1-release - do not merge

Change-Id: I4d84725585d8d949477a1c5e398faf4828c0d3e0

commit | commitdiff | tree

The Android Automerger [Sat, 3 Nov 2012 18:32:00 +0000 (11:32 -0700)]

JOP34

commit | commitdiff | tree

The Android Automerger [Sat, 3 Nov 2012 18:31:19 +0000 (11:31 -0700)]

merge in jb-mr1-release history after reset to jb-mr1-dev

commit | commitdiff | tree

Nick Sanders [Sat, 3 Nov 2012 01:48:59 +0000 (18:48 -0700)]

am 9af26ddd: Merge "Disable factory build under PDK" into jb-mr1-aah-dev

* commit '9af26dddb39e5d87c8a455eb462eb3039e45ad69':
Disable factory build under PDK

commit | commitdiff | tree

Nick Sanders [Sat, 3 Nov 2012 01:46:44 +0000 (18:46 -0700)]

Merge "Disable factory build under PDK" into jb-mr1-aah-dev

commit | commitdiff | tree

The Android Automerger [Sat, 3 Nov 2012 00:35:24 +0000 (17:35 -0700)]

JOP33

commit | commitdiff | tree

The Android Automerger [Sat, 3 Nov 2012 00:34:17 +0000 (17:34 -0700)]

merge in jb-mr1-release history after reset to jb-mr1-dev

commit | commitdiff | tree

The Android Automerger [Fri, 2 Nov 2012 21:46:32 +0000 (14:46 -0700)]

JOP32C

commit | commitdiff | tree

Nick Sanders [Fri, 2 Nov 2012 19:55:56 +0000 (12:55 -0700)]

Disable factory build under PDK

Phantasm PDK support doesn't work with the factory build.
It's not needed for eng support so we'll disable it.

Change-Id: I9b65cdbb20bbcff601600d6b0cac7cc98f6f614c
Signed-off-by: Nick Sanders <nsanders@google.com>

commit | commitdiff | tree

The Android Open Source Project [Fri, 2 Nov 2012 14:27:40 +0000 (07:27 -0700)]

Reconcile with jb-mr1-release - do not merge

Change-Id: I0a15906b6b86c84c785eb57cde0b202a3b0a97cf

commit | commitdiff | tree

The Android Automerger [Fri, 2 Nov 2012 06:43:31 +0000 (23:43 -0700)]

JOP32B

commit | commitdiff | tree

The Android Automerger [Fri, 2 Nov 2012 02:06:39 +0000 (19:06 -0700)]

JOP32

commit | commitdiff | tree

The Android Automerger [Fri, 2 Nov 2012 02:04:59 +0000 (19:04 -0700)]

merge in jb-mr1-release history after reset to jb-mr1-dev

commit | commitdiff | tree

Robert Ly [Fri, 2 Nov 2012 00:39:11 +0000 (17:39 -0700)]

am 78377bcd: am 5a6e2407: am 0900e42e: am 12e6b988: am e896e344: Merge "add css animation videos" into jb-dev-docs

* commit '78377bcd1a08d99e446dc7f1e1b886c624dd3148':
add css animation videos

commit | commitdiff | tree

Robert Ly [Fri, 2 Nov 2012 00:36:06 +0000 (17:36 -0700)]

am 5a6e2407: am 0900e42e: am 12e6b988: am e896e344: Merge "add css animation videos" into jb-dev-docs

* commit '5a6e24074851fba5fb40b4f453d1a18852053ffa':
add css animation videos

commit | commitdiff | tree

Robert Ly [Fri, 2 Nov 2012 00:33:03 +0000 (17:33 -0700)]

am 0900e42e: am 12e6b988: am e896e344: Merge "add css animation videos" into jb-dev-docs

* commit '0900e42e488eec40dd40c6e82a9823ca338b11b5':
add css animation videos

commit | commitdiff | tree

Robert Ly [Fri, 2 Nov 2012 00:31:20 +0000 (17:31 -0700)]

am 12e6b988: am e896e344: Merge "add css animation videos" into jb-dev-docs

* commit '12e6b988cbe32fda61957ed87bfb30337c2b8f9d':
add css animation videos

commit | commitdiff | tree

Robert Ly [Fri, 2 Nov 2012 00:28:28 +0000 (17:28 -0700)]

am e896e344: Merge "add css animation videos" into jb-dev-docs

* commit 'e896e3447145859371d2b7172122faabe44d10e2':
add css animation videos

commit | commitdiff | tree

Robert Ly [Fri, 2 Nov 2012 00:26:34 +0000 (17:26 -0700)]

Merge "add css animation videos" into jb-dev-docs

commit | commitdiff | tree

Robert Ly [Fri, 2 Nov 2012 00:09:52 +0000 (17:09 -0700)]

add css animation videos

Change-Id: I2e51cfce1af378e03a9ac40be76ab55e61d19f24

commit | commitdiff | tree

The Android Open Source Project [Thu, 1 Nov 2012 14:51:40 +0000 (07:51 -0700)]

Reconcile with jb-mr1-release - do not merge

Change-Id: Idf71be6e72f974579d6b5fe382f7fe4afd56c7cc