Craig Mautner a52b6e7bcf Merge "Extract code from performLayoutAndPlaceSurfacesInnerLocked() into multiple methods."

2012-02-06 17:04:23 -08:00

..

java

Merge "Extract code from performLayoutAndPlaceSurfacesInnerLocked() into multiple methods."

2012-02-06 17:04:23 -08:00

jni

am 33476f7a: am f79bcd2d: am 52da99fa: am a081c7b8: Merge "Skia API changes as a result of an update to the Skia library."

2012-02-06 14:45:36 -08:00

res

Merge "Add some lint control for the frameworks."

2012-02-06 10:57:50 -08:00

tests

…