OSDN Git Service

resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aosp
authorKenny Root <kroot@google.com>
Tue, 12 Apr 2011 17:27:15 +0000 (10:27 -0700)
committerKenny Root <kroot@google.com>
Tue, 12 Apr 2011 17:27:15 +0000 (10:27 -0700)
commitf6bbefd581a28c2b3c8db74efe66eabdc23ab0b3
treea3402cd0e7a2da9b63a6ca702bb7d9c8533bf223
parent77e4ad4610238db874c89cef077ba833fb04020c
parent8a1a61517645ea989b9045eb209ba1d6fdc23cd8
resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aosp

Change-Id: Ia1a0024aabf531438203eb9fea3a10dd15eabe53
include/utils/ResourceTypes.h
libs/utils/ResourceTypes.cpp