OSDN Git Service

resolved conflicts for merge of 7749a1c5 to jb-mr1-dev
authorJean-Baptiste Queru <jbq@google.com>
Wed, 5 Sep 2012 19:21:50 +0000 (12:21 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 5 Sep 2012 19:21:50 +0000 (12:21 -0700)
commitf389f2820c731b2b938a7057cde9dc11d87bcbe3
tree341afc00da6563ace9d11a6abde2ad05b245dd57
parent5575e97cea2bbaf0f4f1c3445e28cff2759d4f74
parent7749a1c5eccd9e3d514b58cb04bcf13e0441e7d9
resolved conflicts for merge of 7749a1c5 to jb-mr1-dev

Change-Id: If30a6a4ded996749b34f6a975481a97006cbcf97
core/java/android/content/SyncStorageEngine.java
core/res/res/values/config.xml
core/res/res/values/public.xml