Marius Renn
72db32c744
Merge "Google Add-On API Documentation Fixes (5429077)" into ics-mr1
2011-11-30 09:51:17 -08:00
Jean-Baptiste Queru
8dd412a900
Merge from AOSP
...
Change-Id: I992d4a0baefc08e105f76b7e6f6950516047670a
2011-11-30 07:26:18 -08:00
The Android Automerger
b1cb2404f5
IML61
2011-11-30 06:48:37 -08:00
The Android Automerger
2ca7547d90
merge in ics-mr1-release history after reset to ics-mr1
2011-11-30 06:45:15 -08:00
The Android Automerger
b3e5a0ec1c
IML60C
2011-11-29 17:08:24 -08:00
Bruce Beare
37db6cf627
English must be the first language specified
...
The first language specified in PRODUCT_LOCALS is the default.
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-11-29 15:46:28 -08:00
The Android Automerger
71a53c5328
IML60B
2011-11-29 15:28:27 -08:00
The Android Automerger
fad12ed790
IML60
2011-11-29 12:05:06 -08:00
The Android Automerger
158cf177dc
merge in ics-mr1-release history after reset to ics-mr1
2011-11-29 12:02:12 -08:00
Ying Wang
b50bd7f009
Move the prebuilt NDKs to their own git project prebuilts/ndk/.
...
Change-Id: If85986da436d412cff139af1fd8426e420bec121
2011-11-29 11:20:16 -08:00
Ying Wang
9978faf8f5
Move prebuilt SDKs to their own git project.
...
Change-Id: Ie6e9614e43bf82b8dd1f8702968be40cfb76b6c5
2011-11-29 10:24:27 -08:00
The Android Open Source Project
e296b937d4
am d719f6a8: am c99c8c08: Reconcile with ics-mr0-release
...
* commit 'd719f6a81bc285b437c1babd8f8443d115b0833c':
ICL53C
2011-11-29 07:58:17 -08:00
The Android Open Source Project
d719f6a81b
am c99c8c08: Reconcile with ics-mr0-release
...
* commit 'c99c8c081467085c548edf03cbc1500ba3852b44':
ICL53C
2011-11-29 07:56:23 -08:00
The Android Open Source Project
c99c8c0814
Reconcile with ics-mr0-release
...
Change-Id: I612e5d0bd573f86dd61cbe0b47d0b691973539a5
2011-11-29 07:54:00 -08:00
Tor Norbye
bc3d471355
am e96a0500: am dc2450ca: Build fix - include sdk/lint in build.
...
* commit 'e96a0500b442f2f9359acae98de9f56719b63592':
Build fix - include sdk/lint in build.
2011-11-28 15:35:27 -08:00
Tor Norbye
e96a0500b4
am dc2450ca: Build fix - include sdk/lint in build.
...
* commit 'dc2450ca25d1169a42dbe9de127b730718bc0eb9':
Build fix - include sdk/lint in build.
2011-11-28 15:33:45 -08:00
Tor Norbye
dc2450ca25
Build fix - include sdk/lint in build.
2011-11-28 15:05:31 -08:00
Ben Cheng
2260c40bc7
Merge "Point OPROFILE_EVENTS_DIR to oprofile dir in source tree."
2011-11-28 14:57:21 -08:00
Ben Cheng
057fde14d1
Point OPROFILE_EVENTS_DIR to oprofile dir in source tree.
...
Otherwise oprofile will punt with the following error message when
processing results collected by perf events since the event descriptions
are not stored in the default location on the host.
profile: could not open unit mask description file
/usr/local/share/oprofile//arm/armv7/unit_masks
Change-Id: I4ff2f2a87546ed3606490596285fb3e466e8d661
2011-11-28 14:29:39 -08:00
Tor Norbye
40f3dec34a
am d6c8cafd: (-s ours) am 3997910e: am 5dd51bde: Build fix - include sdk/lint in build. do not merge.
...
* commit 'd6c8cafdacab939a5f8581afa15377a6449a8058':
Build fix - include sdk/lint in build. do not merge.
2011-11-28 14:28:32 -08:00
Tor Norbye
d6c8cafdac
am 3997910e: am 5dd51bde: Build fix - include sdk/lint in build. do not merge.
...
* commit '3997910eeaff5a605f2f2968dd0c617dcd10183d':
Build fix - include sdk/lint in build. do not merge.
2011-11-28 14:26:41 -08:00
Tor Norbye
3997910eea
am 5dd51bde: Build fix - include sdk/lint in build. do not merge.
...
* commit '5dd51bde0b0b4a8ca6d1b6a8da1f6739197999a2':
Build fix - include sdk/lint in build. do not merge.
2011-11-28 13:37:17 -08:00
Tor Norbye
5dd51bde0b
Build fix - include sdk/lint in build. do not merge.
...
(cherry picked from commit 4377cc701a
2011-11-28 13:07:53 -08:00
The Android Automerger
2fc337b236
IML59
2011-11-28 12:25:45 -08:00
The Android Automerger
86a99673f5
merge in ics-mr1-release history after reset to ics-mr1
2011-11-28 12:21:20 -08:00
The Android Automerger
9101da9742
ICL53C
2011-11-26 12:29:48 -08:00
Marius Renn
b1df701ed8
Google Add-On API Documentation Fixes (5429077)
...
We no longer want a reference directory, but rather
maps_api and effects_api directories.
Change-Id: I72b3a342d0871ec4cf7010be0d2b6486ca83571b
2011-11-23 18:08:51 -08:00
The Android Open Source Project
98ab33fa03
am b5acb8b4: am 070e712f: Reconcile with ics-mr0-release ics-factoryrom-2-release
...
* commit 'b5acb8b45904ae5cc17de847c4036d3f6146847c':
ITL41G
ICL53B
2011-11-23 10:34:27 -08:00
The Android Open Source Project
b5acb8b459
am 070e712f: Reconcile with ics-mr0-release ics-factoryrom-2-release
...
* commit '070e712fb3037b28e81340eb2e4fb53d1539130d':
ITL41G
ICL53B
2011-11-23 09:24:44 -08:00
The Android Open Source Project
070e712fb3
Reconcile with ics-mr0-release ics-factoryrom-2-release
...
Change-Id: Ie10ba0ee48e3f7230c8613b63a6d9b1856b260c6
2011-11-23 09:23:46 -08:00
The Android Automerger
4e776f342a
ITL41G
2011-11-22 21:50:14 -08:00
The Android Automerger
13315dd2ca
ICL53B
2011-11-22 16:14:07 -08:00
The Android Automerger
28693b2b04
merge in ics-mr0-release history after reset to ics-mr0
2011-11-22 16:13:00 -08:00
The Android Open Source Project
6bf1b8a097
am 330875fd: am 24215999: Reconcile with ics-mr0-release
...
* commit '330875fdcf830db62a46ceb9bc0e0c3d9f67b775':
2011-11-22 15:28:03 -08:00
The Android Open Source Project
330875fdcf
am 24215999: Reconcile with ics-mr0-release
...
* commit '24215999d0a9d603aeea3c88ceedfb8e36fcf947':
ICL53
2011-11-22 15:26:13 -08:00
The Android Open Source Project
24215999d0
Reconcile with ics-mr0-release
...
Change-Id: I3797edc6648a93700423b6ad4fb50d2e36c62bfc
2011-11-22 15:23:59 -08:00
The Android Open Source Project
53343ec94d
Reconcile with ics-mr0-release
...
Change-Id: Icd071d37f41bb60a49fd88195b433b95733da769
2011-11-22 15:15:38 -08:00
The Android Automerger
54aa08fdbb
ICL53
2011-11-22 14:29:10 -08:00
The Android Automerger
fee376bcd6
merge in ics-mr0-release history after reset to ics-mr0
2011-11-22 14:26:36 -08:00
The Android Open Source Project
33b2a9475d
Reconcile with ics-mr1-release
...
Change-Id: If09ddcaa675b12a1d92a48f2c7ce7c315482f43f
2011-11-22 13:25:31 -08:00
The Android Open Source Project
8c58fcaaa0
am 43583c1a: am 5cd44bd3: Reconcile with ics-mr0-release ics-factoryrom-2-release
...
* commit '43583c1a4431d4c237a86ce2a65465706a4a5078':
ITL41F
ITL41E
ICL52
ICL49B
2011-11-22 13:24:05 -08:00
The Android Open Source Project
43583c1a44
am 5cd44bd3: Reconcile with ics-mr0-release ics-factoryrom-2-release
...
* commit '5cd44bd38f4d2158758a97e8a871a3b9cd6b6b37':
ITL41F
ITL41E
ICL52
ICL49B
2011-11-22 13:22:23 -08:00
The Android Open Source Project
5cd44bd38f
Reconcile with ics-mr0-release ics-factoryrom-2-release
...
Change-Id: Ie25ab898e849e7d52c08796cd7f1bea6f12d6bd1
2011-11-22 13:19:59 -08:00
Jean-Baptiste Queru
25f0158c18
am 6b95f9b0: Ignore version numbers from AOSP
...
* commit '6b95f9b002c819a35ce68ce930007618e2f30ff7':
Restore AOSP-specific pseudo-version-numbers.
2011-11-22 12:42:02 -08:00
Jean-Baptiste Queru
6b95f9b002
Ignore version numbers from AOSP
...
Change-Id: I971716e56ec5649013ba50c6bb385329074be40b
2011-11-22 12:29:30 -08:00
Jean-Baptiste Queru
d2cbcb40c0
Restore AOSP-specific pseudo-version-numbers.
...
For great justice.
Change-Id: I5a0f722419bff676142ce975a66225f0cd418ff8
2011-11-22 12:21:00 -08:00
The Android Automerger
a96f6f55b8
IML52C
2011-11-22 12:02:47 -08:00
The Android Automerger
2f3d9f53dc
IML53
2011-11-22 11:58:43 -08:00
The Android Automerger
41b9a903c2
merge in ics-mr1-release history after reset to ics-mr1
2011-11-22 11:55:18 -08:00
The Android Automerger
8f83247ceb
IML52B
2011-11-21 19:29:29 -08:00
