diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-12-14 16:26:34 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-12-14 16:26:34 -0800 |
| commit | b5c02ecbde6c00bcbc65917353ec976430d9ffca (patch) | |
| tree | 1d9c459a2f33e6e56933842882ff353325fa7ce5 /core/base_rules.mk | |
| parent | 282d39123949ca76ac96af79bdfb29407b723d02 (diff) | |
| parent | 34e826718e99d56da38ecd5ffd8873997722fa92 (diff) | |
| download | build-b5c02ecbde6c00bcbc65917353ec976430d9ffca.zip build-b5c02ecbde6c00bcbc65917353ec976430d9ffca.tar.gz build-b5c02ecbde6c00bcbc65917353ec976430d9ffca.tar.bz2 | |
am 34e82671: resolved conflicts for merge of 76aa8d0a to gingerbread-plus-aosp
* commit '34e826718e99d56da38ecd5ffd8873997722fa92':
update API version to 9
Diffstat (limited to 'core/base_rules.mk')
0 files changed, 0 insertions, 0 deletions