Merge remote-tracking branch 'sf/android_branch' into android_multi2

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
This commit is contained in:
Eric House 2015-02-19 06:45:11 -08:00
commit 6d8f13df9e

View file

@ -73,7 +73,7 @@ typedef struct LaunchParams {
#ifdef XWFEATURE_DEVID
char* lDevID;
XP_Bool noAnonDevid;
XP_UCHAR devIDStore[16];
XP_UCHAR devIDStore[32];
#endif
VTableMgr* vtMgr;
DictMgrCtxt* dictMgr;