OSDN Git Service

resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp
authorKenny Root <kroot@google.com>
Tue, 30 Apr 2013 06:09:03 +0000 (23:09 -0700)
committerKenny Root <kroot@google.com>
Tue, 30 Apr 2013 06:09:03 +0000 (23:09 -0700)
commite9ae6822a80cb1f3bd13c785f1727c03d35da52e
treeb1458872d38a68b06c277276a3062bac0247509d
parentbe53f1806cf9f0ec69f785a0063227e0ed795eb8
parent1f6e789b7ee9698ab8c528a393c28cce500ace04
resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp

Change-Id: I06c05d637613215b6d83df3e29cd495f6a5a0176
Android.mk
core/java/android/app/ActivityThread.java
core/java/android/webkit/BrowserFrame.java
keystore/java/android/security/AndroidKeyPairGenerator.java
keystore/java/android/security/AndroidKeyStore.java
keystore/java/android/security/KeyChain.java
keystore/tests/src/android/security/AndroidKeyStoreTest.java
preloaded-classes