Dianne Hackborn e6eb0772d6 am fce232b4: am 5a4b4084: am b96a6916: Merge "Fix issue android-app doc, bump battery stats checkin version" into lmp-mr1-dev ...

* commit 'fce232b4080a12220821568ab670a0cdce4893c5':
  Fix issue android-app doc, bump battery stats checkin version

2015-01-15 04:57:52 +00:00

..

java

am fce232b4: am 5a4b4084: am b96a6916: Merge "Fix issue android-app doc, bump battery stats checkin version" into lmp-mr1-dev

2015-01-15 04:57:52 +00:00

jni

Merge "Update HWUI to store its own SkBitmap objects"

2015-01-14 15:06:27 +00:00

res

resolved conflicts for merge of da562f3d to master

2015-01-14 20:49:37 -08:00

tests

am f5f345cf: am 837261cc: Merge "Fix HttpResponseCacheTest in anticipation of an OkHttp upgrade."

2015-01-12 16:44:36 +00:00