Merge commit '1121ceba04131669a95e6cc7e3cb83a3a87c8ea2' into eclair-plus-aosp * commit '1121ceba04131669a95e6cc7e3cb83a3a87c8ea2': SDK: remove default.properties from ApiDemos
Merge commit '1121ceba04131669a95e6cc7e3cb83a3a87c8ea2' into eclair-plus-aosp * commit '1121ceba04131669a95e6cc7e3cb83a3a87c8ea2': SDK: remove default.properties from ApiDemos