Dianne Hackborn 63f38a0836 am e83f322f: am 30854356: am 29a11523: am c3014c8c: Merge "Fix issue #17705755: Battery stats resets at incorrect times" into lmp-dev ...

* commit 'e83f322fa91f64844ea24aab2944540ca43a2a01':
  Fix issue #17705755: Battery stats resets at incorrect times

2014-10-01 17:09:29 +00:00

..

java

am e83f322f: am 30854356: am 29a11523: am c3014c8c: Merge "Fix issue #17705755: Battery stats resets at incorrect times" into lmp-dev

2014-10-01 17:09:29 +00:00

jni

am ee7684ca: am 04517286: Merge "Use strerror(3) when reporting zygote failures."

2014-09-30 17:16:27 +00:00

res

Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

2014-10-01 04:25:39 +00:00

tests

…