Wink Saville
69babbdc38
am 061604bd
: am 0262d0f7
: Merge "Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE."
...
* commit '061604bdadd797a5371248c177e77c942c2c44f6':
Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
2013-04-01 18:04:14 -07:00
Wink Saville
061604bdad
am 0262d0f7
: Merge "Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE."
...
* commit '0262d0f74725f8a165b20eeac323cdd8ca31df03':
Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
2013-04-01 18:02:06 -07:00
Wink Saville
0262d0f747
Merge "Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE."
2013-04-02 00:43:39 +00:00
Ying Wang
f94ace13bd
am 6686497b
: am 51f7dcb9
: Merge "Default install path of shared Java library with tag tests" into jb-mr2-dev
...
* commit '6686497ba38eec4b1ec62fc40b25b111a3653643':
Default install path of shared Java library with tag tests
2013-04-01 12:06:02 -07:00
Ying Wang
6686497ba3
am 51f7dcb9
: Merge "Default install path of shared Java library with tag tests" into jb-mr2-dev
...
* commit '51f7dcb9adb60c91bf85d3148c841efa2b3a14f2':
Default install path of shared Java library with tag tests
2013-04-01 12:03:46 -07:00
Ying Wang
51f7dcb9ad
Merge "Default install path of shared Java library with tag tests" into jb-mr2-dev
2013-04-01 19:00:13 +00:00
Ying Wang
3f33b9e00c
am 0f7e0694
: am a1fd8e44
: Merge "Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools"
...
* commit '0f7e0694a575fa4472f43e6a4e11c053ff99d69b':
Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools
2013-03-29 19:19:49 -07:00
Ying Wang
0f7e0694a5
am a1fd8e44
: Merge "Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools"
...
* commit 'a1fd8e44b71a83f2733258b020c4057af3c4046a':
Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools
2013-03-29 19:18:38 -07:00
Ying Wang
a1fd8e44b7
Merge "Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools"
2013-03-30 01:20:27 +00:00
Ying Wang
564f912223
Augment ANDROID_DEV_SCRIPTS with prebuilts/devtools/tools
...
Change-Id: Ia3647674f294c42e9fbe2163bf0d70012313bb15
2013-03-29 17:40:14 -07:00
Raph Levien
cbdfc8ee7f
am a1eb76ae
: am 59fa08bd
: Merge "Switch Indic fonts to Noto" into jb-mr2-dev
...
* commit 'a1eb76aeb6d3df64b960ad47b60f408765c52069':
Switch Indic fonts to Noto
2013-03-29 14:35:15 -07:00
Raph Levien
a1eb76aeb6
am 59fa08bd
: Merge "Switch Indic fonts to Noto" into jb-mr2-dev
...
* commit '59fa08bd3c624be9ea06789b70c22b483df612c4':
Switch Indic fonts to Noto
2013-03-29 10:44:17 -07:00
Raph Levien
59fa08bd3c
Merge "Switch Indic fonts to Noto" into jb-mr2-dev
2013-03-29 17:43:08 +00:00
Raph Levien
ddfb58bfde
Switch Indic fonts to Noto
...
This patch changes the fonts actually installed on the device from
the older cibu and lohit fonts to the new noto ones. Note that the
decision of whether to include the fonts based on device profile
is in the fonts.mk of the individual font projects.
Change-Id: I8b9dced0cf5bef3f8a011f925c263c346f49e407
2013-03-29 10:22:31 -07:00
The Android Open Source Project
385ad9d698
am d28e10d6
: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit 'd28e10d6c183a1e6e2f7be1001188d635c730f87':
JWQ87C
JWQ87B
JWQ87
JWQ86C
JWQ86B
JWQ86
2013-03-29 09:50:35 -07:00
The Android Open Source Project
d28e10d6c1
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I88a69e508f1bd76db6289d1956f0861701a30391
2013-03-29 09:48:35 -07:00
Benoit Goby
d96f8a6c70
Merge "Add reboot to build"
2013-03-29 03:13:42 +00:00
The Android Automerger
bb999c493b
JWQ87C
2013-03-28 17:28:35 -07:00
keunyoung
69e8d67768
am aa0d1a17
: am 6f79520b
: Merge "find pdk platform.zip from full_ directory as well for aosp_ products" into jb-mr2-dev
...
* commit 'aa0d1a173787bdc766a0fa48052c0cf796f91602':
find pdk platform.zip from full_ directory as well for aosp_ products
2013-03-28 17:15:40 -07:00
keunyoung
aa0d1a1737
am 6f79520b
: Merge "find pdk platform.zip from full_ directory as well for aosp_ products" into jb-mr2-dev
...
* commit '6f79520bf77840f260b02143a556e4004e384732':
find pdk platform.zip from full_ directory as well for aosp_ products
2013-03-28 17:12:54 -07:00
keunyoung
6f79520bf7
Merge "find pdk platform.zip from full_ directory as well for aosp_ products" into jb-mr2-dev
2013-03-29 00:11:23 +00:00
Devin Kim
7a9967ac83
am e8ca0a6f
: am 60b9efc0
: Do not disable factory build under PDK
...
* commit 'e8ca0a6f06a480322c40bd13e605885248b1ef1a':
Do not disable factory build under PDK
2013-03-28 16:43:56 -07:00
Devin Kim
e8ca0a6f06
am 60b9efc0
: Do not disable factory build under PDK
...
* commit '60b9efc060162a9ce0c8bc2ca3b9139c498eb50c':
Do not disable factory build under PDK
2013-03-28 16:42:42 -07:00
Ulas Kirazci
76e3a39061
Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
...
Change-Id: I7429015b3c5f7f38b7be01eb2d4927f7a9999c80
2013-03-28 16:28:09 -07:00
The Android Automerger
2b94d4ee0a
JWQ87B
2013-03-28 15:46:28 -07:00
keunyoung
3b4856e842
find pdk platform.zip from full_ directory as well for aosp_ products
...
Change-Id: I85f8c26e055958b6fa93c375f1080e297795a417
2013-03-28 15:20:38 -07:00
Devin Kim
60b9efc060
Do not disable factory build under PDK
...
This is related to commit a1712e.
Some PDKs need the factory build under PDK. If you want to disable the factory
build under PDK, use TARGET_NO_FACTORY in your device's BoardConfig.mk
Change-Id: I5e208836918ffd737951d3fb1f54c560d2b93641
2013-03-28 14:38:11 -07:00
The Android Automerger
29869913e2
JWQ87
2013-03-28 05:57:57 -07:00
The Android Automerger
5f95fde2eb
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-28 05:55:15 -07:00
Brian Carlstrom
6e24674530
am fd642ed5
: am d76ff19a
: Merge "resolved conflicts for merge of 9a3b17d1
to jb-mr2-dev" into jb-mr2-dev
...
* commit 'fd642ed55349dbb482f27f339e2a3509e05fdf25':
Added local variable info output to javac command for host build.
2013-03-27 17:16:48 -07:00
Stephen Hines
c519284395
am 92b82aa2
: am ffbeac3f
: Merge "Link RS compatibility files with libc and make bcc_compat a regular dep." into jb-mr2-dev
...
* commit '92b82aa2eeb9f3867e2d381e8324da4ebc35658e':
Link RS compatibility files with libc and make bcc_compat a regular dep.
2013-03-27 17:16:47 -07:00
Brian Carlstrom
fd642ed553
am d76ff19a
: Merge "resolved conflicts for merge of 9a3b17d1
to jb-mr2-dev" into jb-mr2-dev
...
* commit 'd76ff19a0f358d1b6473c33157c5ace2128d9623':
Added local variable info output to javac command for host build.
2013-03-27 17:14:47 -07:00
Stephen Hines
92b82aa2ee
am ffbeac3f
: Merge "Link RS compatibility files with libc and make bcc_compat a regular dep." into jb-mr2-dev
...
* commit 'ffbeac3f47d192e96c901189a3f5bd2fd4407a97':
Link RS compatibility files with libc and make bcc_compat a regular dep.
2013-03-27 17:14:43 -07:00
Brian Carlstrom
d76ff19a0f
Merge "resolved conflicts for merge of 9a3b17d1
to jb-mr2-dev" into jb-mr2-dev
2013-03-28 00:11:20 +00:00
Brian Carlstrom
8c374054b3
resolved conflicts for merge of 9a3b17d1
to jb-mr2-dev
...
Change-Id: I7699f3c6ef3fcf1f16bbfff05f7b238328f8fbd6
2013-03-27 17:04:05 -07:00
Stephen Hines
ffbeac3f47
Merge "Link RS compatibility files with libc and make bcc_compat a regular dep." into jb-mr2-dev
2013-03-27 23:59:29 +00:00
Stephen Hines
8db4ccea4a
Link RS compatibility files with libc and make bcc_compat a regular dep.
...
If we don't do "-lc", we end up missing symbols like "memset" on our non-NEON
builds. It also makes more sense to have bcc_compat as a standard dependency
for now, since it occasionally changes the way we compile/link our source
files.
Change-Id: I4b0ead66caa7c72fb7733db8804a33faa5350930
2013-03-27 16:51:38 -07:00
Brian Carlstrom
9a3b17d184
am 923ac1a8
: Merge "Added local variable info output to javac command for host build."
...
* commit '923ac1a8717f38f116708c259b8d75bc303abd5a':
Added local variable info output to javac command for host build.
2013-03-27 16:40:25 -07:00
The Android Automerger
68f6cc9d0f
JWQ86C
2013-03-27 16:22:58 -07:00
Scott Main
55bfc2ce57
am b9fc1c90
: am 4b735966
: am 6c3f41ac
: am a6188a56
: am 972c3798
: am 28ca0f32
: am 25e7300c
: load the navtree javascript on demand; don\'t try setting up the tree until it\'s loaded
...
* commit 'b9fc1c9068a34a0b6a1d8c5c2424c98a008fb20a':
load the navtree javascript on demand; don't try setting up the tree until it's loaded
2013-03-27 16:16:34 -07:00
Scott Main
b9fc1c9068
am 4b735966
: am 6c3f41ac
: am a6188a56
: am 972c3798
: am 28ca0f32
: am 25e7300c
: load the navtree javascript on demand; don\'t try setting up the tree until it\'s loaded
...
* commit '4b7359662b532484f9a329f58b7f5c3c016a5ac5':
load the navtree javascript on demand; don't try setting up the tree until it's loaded
2013-03-27 16:14:28 -07:00
Scott Main
4b7359662b
am 6c3f41ac
: am a6188a56
: am 972c3798
: am 28ca0f32
: am 25e7300c
: load the navtree javascript on demand; don\'t try setting up the tree until it\'s loaded
...
* commit '6c3f41ac7cf51c0a3405296853b075f929e07397':
load the navtree javascript on demand; don't try setting up the tree until it's loaded
2013-03-27 16:12:22 -07:00
The Android Automerger
476c4c4b97
JWQ86B
2013-03-27 16:10:32 -07:00
Scott Main
6c3f41ac7c
am a6188a56
: am 972c3798
: am 28ca0f32
: am 25e7300c
: load the navtree javascript on demand; don\'t try setting up the tree until it\'s loaded
...
* commit 'a6188a56ea8f10a3ce81fb95fbf508cae688c4b1':
load the navtree javascript on demand; don't try setting up the tree until it's loaded
2013-03-27 16:10:10 -07:00
Scott Main
a6188a56ea
am 972c3798
: am 28ca0f32
: am 25e7300c
: load the navtree javascript on demand; don\'t try setting up the tree until it\'s loaded
...
* commit '972c3798890f8b0e20005eece62ee88f508dd761':
load the navtree javascript on demand; don't try setting up the tree until it's loaded
2013-03-27 16:07:57 -07:00
Scott Main
972c379889
am 28ca0f32
: am 25e7300c
: load the navtree javascript on demand; don\'t try setting up the tree until it\'s loaded
...
* commit '28ca0f324454faa3c6d40331ecb3abb1c1a13d74':
load the navtree javascript on demand; don't try setting up the tree until it's loaded
2013-03-27 16:05:56 -07:00
Scott Main
28ca0f3244
am 25e7300c
: load the navtree javascript on demand; don\'t try setting up the tree until it\'s loaded
...
* commit '25e7300c2499d0ecaad91aecc3fbf988c59fc7da':
load the navtree javascript on demand; don't try setting up the tree until it's loaded
2013-03-27 16:03:55 -07:00
Scott Main
25e7300c24
load the navtree javascript on demand; don't try setting up the tree until it's loaded
...
Change-Id: I1f209869a17099dd853a2f4cae766481a6cd03eb
2013-03-27 15:49:14 -07:00
Brian Carlstrom
923ac1a871
Merge "Added local variable info output to javac command for host build."
2013-03-27 22:44:30 +00:00
The Android Automerger
1495b13771
JWQ86
2013-03-27 05:57:57 -07:00