Craig Mautner 5d3f00e38b am 358188f5: Merge "Change ActivityView startActivity state sequence" into lmp-mr1-modular-dev ...

* commit '358188f5891f5645dbff4fd8cb1a3e7341371f74':
  Change ActivityView startActivity state sequence

2015-03-03 21:08:45 +00:00

..

java

am 358188f5: Merge "Change ActivityView startActivity state sequence" into lmp-mr1-modular-dev

2015-03-03 21:08:45 +00:00

jni

am a891d08d: Merge "jni: Add paranoia regarding android_logger_list_read"

2015-02-27 18:52:36 +00:00

res

Import translations. DO NOT MERGE

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

tests

resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aosp

2015-02-11 12:37:12 -08:00