Merge from master

Change-Id: I0cecc81f9b34cb6d965d2a8528ced3f45d931436
This commit is contained in:
The Android Open Source Project 2012-11-01 11:06:06 -07:00
commit ab295d3c95

View file

@ -96,6 +96,7 @@
<project path="external/guava" name="platform/external/guava" /> <project path="external/guava" name="platform/external/guava" />
<project path="external/hamcrest" name="platform/external/hamcrest" /> <project path="external/hamcrest" name="platform/external/hamcrest" />
<project path="external/harfbuzz" name="platform/external/harfbuzz" /> <project path="external/harfbuzz" name="platform/external/harfbuzz" />
<project path="external/harfbuzz_ng" name="platform/external/harfbuzz_ng" />
<project path="external/hyphenation" name="platform/external/hyphenation" /> <project path="external/hyphenation" name="platform/external/hyphenation" />
<project path="external/icu4c" name="platform/external/icu4c" /> <project path="external/icu4c" name="platform/external/icu4c" />
<project path="external/iproute2" name="platform/external/iproute2" /> <project path="external/iproute2" name="platform/external/iproute2" />