resolved conflicts for merge of 17c61aaf to master

Change-Id: I288054a9e6997ec3e8e2906058b83c7d629a239a

diff --cc ide/eclipse/.classpath
index b303a61,8eddc9e..d75c7bb
--- 1/ide/eclipse/.classpath
--- 2/ide/eclipse/.classpath
+++ b/ide/eclipse/.classpath
@@@ -49,7 -49,7 +49,8 @@@
        <classpathentry kind="src" path="frameworks/base/test-runner/src"/>
        <classpathentry kind="src" path="frameworks/base/vpn/java"/>
        <classpathentry kind="src" path="frameworks/base/wifi/java"/>
+       <classpathentry kind="src" path="frameworks/ex/common/java"/>
 +      <classpathentry kind="src" path="frameworks/opt/vcard/java"/>
        <classpathentry kind="src" path="development/samples/ApiDemos/src"/>
        <classpathentry kind="src" path="development/samples/ApiDemos/tests/src"/>
        <classpathentry kind="src" path="development/samples/Compass/src"/>