Craig Mautner 358188f589 Merge "Change ActivityView startActivity state sequence" into lmp-mr1-modular-dev

2015-03-03 21:03:29 +00:00

..

java

Merge "Change ActivityView startActivity state sequence" into lmp-mr1-modular-dev

2015-03-03 21:03:29 +00:00

jni

am 494d5b77: Merge "Check that bitmap\'s size does not exceed 32 bits. DO NOT MERGE" into lmp-dev

2015-02-19 00:05:53 +00:00

res

Import translations. DO NOT MERGE

2015-03-02 07:48:34 -06:00

tests

am feb362a5: am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation

2015-01-30 22:24:43 +00:00