OSDN Git Service

resolved conflicts for merge of b68f5f09 to master
authorKenny Root <kroot@google.com>
Fri, 30 May 2014 18:51:20 +0000 (11:51 -0700)
committerKenny Root <kroot@google.com>
Fri, 30 May 2014 18:51:20 +0000 (11:51 -0700)
commit25e40de45f89490f03ca010a88d2265d9c901493
treeb546d2ffc3907bb4dbdaaa29dad77ed7e25caa1d
parent26e8f040ba383dc44c25013692748cc27e50799d
parentb68f5f0932511fb9975b7e04eebe48707af59e0a
resolved conflicts for merge of b68f5f09 to master

Change-Id: Ib8dd3a353f40a3357c8dc5ac591cd5e3ab4d0a4b
libs/hwui/PathCache.cpp
libs/hwui/PathCache.h