Ying Wang
90304a74a3
am ae56a570
: am e1f94189
: am ce811261
: Merge "Move check-api to definition.mk" into jb-mr1.1-dev
...
* commit 'ae56a570cb7e16a0853433d20691b0ee72da5cc2':
Move check-api to definition.mk
2012-11-16 10:42:41 -08:00
Scott Main
508d4a42e0
am 234fa617
: am aa09fda2
: am 2dc85a0f
: am 83cd28b3
: am 9efb6b09
: am be264b6d
: am 5a1123ef
: add script to generate list of classes for each training course landing page
...
* commit '234fa6175ce16bc64dca65e52ebbfe6465b8d75a':
add script to generate list of classes for each training course landing page
2012-11-16 09:35:57 -08:00
Marco Nelissen
3f25d2232f
Merge "Add gsm codec to the build"
2012-11-16 09:20:37 -08:00
Marco Nelissen
8af41153d7
Add gsm codec to the build
...
b/6620569
Change-Id: Ieb113ecc9d1195360335c29fc9d1256205cd2516
2012-11-15 16:22:39 -08:00
Ying Wang
ae56a570cb
am e1f94189
: am ce811261
: Merge "Move check-api to definition.mk" into jb-mr1.1-dev
...
* commit 'e1f94189d95084a72d206d89ecb9d38de0512fc6':
Move check-api to definition.mk
2012-11-15 15:23:44 -08:00
Ying Wang
e1f94189d9
am ce811261
: Merge "Move check-api to definition.mk" into jb-mr1.1-dev
...
* commit 'ce811261bc8d56d43e59b1f9fb96ae53192de126':
Move check-api to definition.mk
2012-11-15 15:20:58 -08:00
Ying Wang
ce811261bc
Merge "Move check-api to definition.mk" into jb-mr1.1-dev
2012-11-15 15:17:43 -08:00
Scott Main
234fa6175c
am aa09fda2
: am 2dc85a0f
: am 83cd28b3
: am 9efb6b09
: am be264b6d
: am 5a1123ef
: add script to generate list of classes for each training course landing page
...
* commit 'aa09fda25ee5b349e55ff502536a38f2f44b28b3':
add script to generate list of classes for each training course landing page
2012-11-14 17:46:08 -08:00
Scott Main
aa09fda25e
am 2dc85a0f
: am 83cd28b3
: am 9efb6b09
: am be264b6d
: am 5a1123ef
: add script to generate list of classes for each training course landing page
...
* commit '2dc85a0fe0a9a01843b74945aeda9195e44869c2':
add script to generate list of classes for each training course landing page
2012-11-14 17:44:57 -08:00
Scott Main
2dc85a0fe0
am 83cd28b3
: am 9efb6b09
: am be264b6d
: am 5a1123ef
: add script to generate list of classes for each training course landing page
...
* commit '83cd28b354e222e5ca78b17229fa456e40d8c900':
add script to generate list of classes for each training course landing page
2012-11-14 17:42:20 -08:00
Scott Main
83cd28b354
am 9efb6b09
: am be264b6d
: am 5a1123ef
: add script to generate list of classes for each training course landing page
...
* commit '9efb6b09c4a32cc5cd190a224d15022968859ddb':
add script to generate list of classes for each training course landing page
2012-11-14 17:40:58 -08:00
Scott Main
9efb6b09c4
am be264b6d
: am 5a1123ef
: add script to generate list of classes for each training course landing page
...
* commit 'be264b6da6631b8c7d526fc3dc76a6ddbb881fee':
add script to generate list of classes for each training course landing page
2012-11-14 17:39:42 -08:00
Scott Main
be264b6da6
am 5a1123ef
: add script to generate list of classes for each training course landing page
...
* commit '5a1123ef7a43c007ff4cfb6c04d3f9dc5436f1c6':
add script to generate list of classes for each training course landing page
2012-11-14 17:38:11 -08:00
Scott Main
5a1123ef7a
add script to generate list of classes for each training course landing page
...
Change-Id: Ieac8a97a8d6fda41a3682241901150cfe16afc4d
2012-11-14 17:31:07 -08:00
Ying Wang
c065da2307
Move check-api to definition.mk
...
1) Move check-api to definition.mk, so it can be used in other places.
2) Add additional dependency to the api-stub module to consolidate the
apicheck dependency. Previously you have to run 2 "make"s in a row and
only in the 2nd run apicheck is run, due to a gnu-make optimization.
Bug: 7540265
Change-Id: Ib24ed87d9330027a9f95ed7b16dd4002cc0e3198
2012-11-14 16:00:45 -08:00
Scott Main
e94ed26cc4
am 1e94081f
: am c264f9eb
: am 912ed02b
: am 7c05b69c
: docs: add warning message for adt when on 32-bit os
...
* commit '1e94081f55d015f89409adeacf9ea531a30465fe':
docs: add warning message for adt when on 32-bit os
2012-11-14 15:20:08 -08:00
Scott Main
1e94081f55
am c264f9eb
: am 912ed02b
: am 7c05b69c
: docs: add warning message for adt when on 32-bit os
...
* commit 'c264f9eb78e2253e91cc0dca11cdf354d341df96':
docs: add warning message for adt when on 32-bit os
2012-11-14 15:17:57 -08:00
Scott Main
c264f9eb78
am 912ed02b
: am 7c05b69c
: docs: add warning message for adt when on 32-bit os
...
* commit '912ed02b53c1c656df1b92a6a2518f48b8be9832':
docs: add warning message for adt when on 32-bit os
2012-11-14 15:15:25 -08:00
Scott Main
912ed02b53
am 7c05b69c
: docs: add warning message for adt when on 32-bit os
...
* commit '7c05b69c0c985bd2f57caec9143710a2204317b8':
docs: add warning message for adt when on 32-bit os
2012-11-14 15:13:25 -08:00
Scott Main
7c05b69c0c
docs: add warning message for adt when on 32-bit os
...
Change-Id: I457a219bb1f9e07d6b94084c69c56309568a4881
2012-11-14 14:12:29 -08:00
The Android Open Source Project
8b9bc71997
am 605d6acb
: (-s ours) Reconcile with jb-mr1.1-release - do not merge
...
* commit '605d6acbd8eb654f15d3253027e6745aeb1bf67c':
JDP45
2012-11-14 12:42:50 -08:00
The Android Open Source Project
605d6acbd8
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: I01253a246391b976768fa35cecaba09f15e2bcd5
2012-11-14 12:40:44 -08:00
The Android Automerger
fed8cf4487
JDP45
2012-11-14 11:30:08 -08:00
The Android Automerger
fdeeaee457
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-11-14 11:27:43 -08:00
Chris Craik
57556d8303
Merge "Improve gdbclient pid handling"
2012-11-13 14:42:44 -08:00
Ying Wang
a657620d08
Merge "Additional certificates support for an apk."
2012-11-13 12:02:35 -08:00
Scott Main
4c7a2448f3
am eeb8d64a
: am ee217260
: am 4e9b723f
: am 098d8dea
: docs: add support for ndk tos wall
...
* commit 'eeb8d64ad1a95c9e3105081a568a85452bc11796':
docs: add support for ndk tos wall
2012-11-13 11:48:12 -08:00
Scott Main
eeb8d64ad1
am ee217260
: am 4e9b723f
: am 098d8dea
: docs: add support for ndk tos wall
...
* commit 'ee2172600b52d73944696e414a0c40e812d4f5d5':
docs: add support for ndk tos wall
2012-11-13 11:46:12 -08:00
Scott Main
ee2172600b
am 4e9b723f
: am 098d8dea
: docs: add support for ndk tos wall
...
* commit '4e9b723f694b4713bdc30e8019b82b43b1217bae':
docs: add support for ndk tos wall
2012-11-13 11:44:46 -08:00
Scott Main
4e9b723f69
am 098d8dea
: docs: add support for ndk tos wall
...
* commit '098d8deaefaf6f834db86c15999d2aedd038d272':
docs: add support for ndk tos wall
2012-11-13 11:42:50 -08:00
Scott Main
098d8deaef
docs: add support for ndk tos wall
...
Change-Id: Ife49429b8241f4e9ce5aaa9f6494d52014a3f238
2012-11-13 11:40:42 -08:00
Ying Wang
31df068b38
Additional certificates support for an apk.
...
Change-Id: I5b35d5728ba9d65f7ece956127270a9ca2ea0efe
2012-11-13 10:56:04 -08:00
Scott Main
147b1eedc5
am 1f45897e
: am 8853adf3
: am 3894b39e
: am df0e1617
: docs: css fix
...
* commit '1f45897eec97db1a9aefb77d7ebe7adbfccefe19':
docs: css fix
2012-11-13 08:00:39 -08:00
Scott Main
0803856408
am 89b3781b
: am 14db0ea5
: am 6f4d588f
: am e0c11a6f
: docs: fix broken template
...
* commit '89b3781b3108ef67c8bb027949bf7d72c5e02391':
docs: fix broken template
2012-11-13 08:00:38 -08:00
Scott Main
1f45897eec
am 8853adf3
: am 3894b39e
: am df0e1617
: docs: css fix
...
* commit '8853adf399c9f809e959bb43a5450cfbf756b525':
docs: css fix
2012-11-13 07:58:47 -08:00
Scott Main
89b3781b31
am 14db0ea5
: am 6f4d588f
: am e0c11a6f
: docs: fix broken template
...
* commit '14db0ea5f22ebc03820c4bb6868196b0cfebff0d':
docs: fix broken template
2012-11-13 07:58:46 -08:00
Scott Main
8853adf399
am 3894b39e
: am df0e1617
: docs: css fix
...
* commit '3894b39ec39d0ae1ba165753fb50373db4bd8077':
docs: css fix
2012-11-13 07:56:55 -08:00
Scott Main
14db0ea5f2
am 6f4d588f
: am e0c11a6f
: docs: fix broken template
...
* commit '6f4d588faa0cef536970f1a227c0f1b41eced1e7':
docs: fix broken template
2012-11-13 07:55:32 -08:00
Scott Main
3894b39ec3
am df0e1617
: docs: css fix
...
* commit 'df0e161703de693dd6a837c56be810a9e29e7d3c':
docs: css fix
2012-11-13 07:55:09 -08:00
Scott Main
54694dc394
am 15be76c6
: am b2adfb7f
: am f528f430
: am bbffb4bf
: docs: add support for templated tabs with the doc title
...
* commit '15be76c687a08d5da04c80fc743a04b6e87a4b50':
docs: add support for templated tabs with the doc title
2012-11-13 07:54:43 -08:00
Scott Main
6f4d588faa
am e0c11a6f
: docs: fix broken template
...
* commit 'e0c11a6f9ae9345da7109c4b08d26778e8265520':
docs: fix broken template
2012-11-13 07:52:42 -08:00
Scott Main
df0e161703
docs: css fix
...
Change-Id: Ie03e7708866fd2e97347ee10f3a40b2f77b0a803
2012-11-13 07:52:20 -08:00
Scott Main
15be76c687
am b2adfb7f
: am f528f430
: am bbffb4bf
: docs: add support for templated tabs with the doc title
...
* commit 'b2adfb7fd292d4d7e2cdbc33e7d07357e78c4e82':
docs: add support for templated tabs with the doc title
2012-11-13 07:51:47 -08:00
Scott Main
b2adfb7fd2
am f528f430
: am bbffb4bf
: docs: add support for templated tabs with the doc title
...
* commit 'f528f4307df61565ec70cc59776949f1b826878a':
docs: add support for templated tabs with the doc title
2012-11-13 07:48:39 -08:00
Scott Main
e0c11a6f9a
docs: fix broken template
...
Change-Id: Ibb804bcf8851cdb15cf6c98dff25a3a391eb8301
2012-11-13 07:47:50 -08:00
Scott Main
f528f4307d
am bbffb4bf
: docs: add support for templated tabs with the doc title
...
* commit 'bbffb4bfb48eb0adb7dc827594f41428f8ffcc19':
docs: add support for templated tabs with the doc title
2012-11-13 07:46:45 -08:00
Scott Main
bbffb4bfb4
docs: add support for templated tabs with the doc title
...
Change-Id: I820a2704d21c94a9a452854a46ea88749d8274d0
2012-11-13 07:40:16 -08:00
Scott Main
a670481671
am af057169
: am f1468dcd
: am 896f9ec9
: am 705e8a4f
: docs: something whatever
...
* commit 'af057169b7a6a6210bdf143b5f3a578c25a22722':
docs: something whatever
2012-11-13 06:30:32 -08:00
Scott Main
af057169b7
am f1468dcd
: am 896f9ec9
: am 705e8a4f
: docs: something whatever
...
* commit 'f1468dcd54d600b4e51d8d5962e0c9e3896f1a1e':
docs: something whatever
2012-11-13 06:28:19 -08:00
Scott Main
f1468dcd54
am 896f9ec9
: am 705e8a4f
: docs: something whatever
...
* commit '896f9ec991a9d92f0a35129347ec1cb85661880c':
docs: something whatever
2012-11-13 06:25:23 -08:00