am 3c9c36b7: am 47c4bbe9: Package the proper vold config file in SDK system image.
am 43e31a20: Add extra IMEs in the full config
Add subdir under frameworks/base for code ported from icu4j.

Change-Id: I6c9fa6dac1f80bbaf8c80b9e0900f4e628ff596f
am a98976b7: am efba0b98: It\'s beginning to look a lot like release time!
Fix get_abs_build_var to work from below $ANDROID_BUILD_TOP

I tried running gdbclient from a subdirectory of $ANDROID_BUILD_TOP
and found that the absolute paths generated by get_abs_build_var
included my subdirectory's path. This fixed get_abs_build_var to
changing directory in a subshell to $ANDROID_BUILD_TOP before invoking
make.

Change-Id: I12b9d9135ac7c044c21c88ed5705b22b0700c039
Merge "docs: various stylesheet changes indent tables revise figure class add caption classes for tables and images add styles for xml reference docs (used by resource types docs) tweak styles for the icon tables to eliminate obscure 'caption' class"
am e0a18a75: Finish moving the policies out of frameworks/policies/base and into frameworks/base.
Merge "Add libbcc.so"
am f2a1c24d: am 966c7355: am 303b3412: Add clean step for SDK version change.
Fixing apicheck to cope with interfaces inherited from other interfaces.

For example, in Java 5, FutureTask was declared like this:
    public class FutureTask<V> implements Runnable, Future<V> {}

In Java 6, it's declared like this:
    public class FutureTask<V> implements RunnableFuture<V> {}
    public interface RunnableFuture extends Runnable, Future<V> {}

Change-Id: I0cd66a655fbe7fd5c7c48099d656b7a39368dac4
Merge "Fixing apicheck to cope with interfaces inherited from other interfaces."
resolved conflicts for merge of 693e6555 to master

Change-Id: I968f5cf82764562ce5a0b61408b8d290d4027aac
am b15c119d: am 19e9fff3: am 74134a50: Add camera sounds to the emulator system image build.
am 52e67ac2: am db00a567: am 479f4a5c: Merge "cherry-pick from master: I615602a3d8f9970e36399b98dadb5e2f03638444 docs: various stylesheet changes indent tables revise figure class add caption classes for tables and images add styles for xml reference docs (used by res
Removing unnecessary tabs, and fixing an IE bug.

Change-Id: I055243ebd47c9319333aa837061015650d57d923
am d31ae2fc: am 8b687440: am fcc7cf77: Fix the check of double quoted @see tag.
Merge "Fix get_abs_build_var to work from below $ANDROID_BUILD_TOP"
am cc45ee9c: On to Kraken...
am 492adf41: am dc5f3888: am 135677a7: For userdebug builds, enable Dalvik lock contention sampling.
Enable query highlighting and result ranking for search autocomplete on d.a.c. Also make it case-insensitive.

Change-Id: Ifa52bb48c7b03c9aa7ad03cfe3e0049024f71a8d