Tom Hudson 40a0709a56 Merge "Merge frameworks/base changes from master-skia to master."

2015-01-07 16:13:42 +00:00

..

java

am 6a3e7015: am d4bc9577: am 1eee52b1: Merge "Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation." into lmp-mr1-dev

2015-01-07 16:06:33 +00:00

jni

Merge "Merge frameworks/base changes from master-skia to master."

2015-01-07 16:13:42 +00:00

res

Import translations. DO NOT MERGE

2015-01-07 07:24:21 -08:00

tests

am 93241de7: Merge "Remove a bitrotted test." automerge: ba6982a

2014-12-18 02:42:27 +00:00