OSDN Git Service

resolved conflicts for merge of 65475f89 to honeycomb-plus-aosp
authorJeff Hamilton <jham@android.com>
Tue, 5 Apr 2011 17:32:50 +0000 (12:32 -0500)
committerJeff Hamilton <jham@android.com>
Tue, 5 Apr 2011 17:32:50 +0000 (12:32 -0500)
commitee3420bc124613827af474684c3015d12742c70d
tree41ac8e9ea5e6399623dc7f51b63ec0f4193eb425
parentb6623abc414ea2a1d1ac3cbfef0c435e3b7e8987
parent65475f89e14cb0914db336652c345e2847c7cb92
resolved conflicts for merge of 65475f89 to honeycomb-plus-aosp

Change-Id: I9f77e84d887dbe84bb94de0fdd369d8de24fbec3
include/private/android_filesystem_config.h