Andre Eisenbach 2ae1b0f350 Merge "Fix bad index usage" am: 5cfe8a8315 am: 83272db445 am: 4184bab40b ...

am: de5ad04c2b

Change-Id: I096f59ffeb24844413ca85dbfa0c9585246870cf

2016-08-04 21:42:06 +00:00

..

java

Merge "Fix bad index usage" am: 5cfe8a8315 am: 83272db445 am: 4184bab40b

2016-08-04 21:42:06 +00:00

jni

Merge "Move from SkData::NewXXX to SkData::MakeXXX."

2016-08-04 13:45:10 +00:00

res

Import translations. DO NOT MERGE

2016-08-03 22:39:09 -07:00

tests

Merge "Have BatteryStats track and report the running wakelocks."

2016-08-03 01:49:50 +00:00