Alan Viverette b2accbb6d2 am 23d86231: am ae656af7: am bab2b594: Merge "Update locally cached drawables when constant state changes" into lmp-mr1-dev ...

* commit '23d86231e9af2f4ba43cbc8a8cbbfc9757a98ddc':
  Update locally cached drawables when constant state changes

2014-12-05 21:49:36 +00:00

..

java

am af3361bb: am 9a3f6ac6: am 6b54d38a: Merge "Add support from restoring recent\'s backup." into lmp-mr1-dev

2014-12-05 21:49:31 +00:00

jni

resolved conflicts for merge of 203c8171 to master

2014-12-04 16:06:34 -08:00

res

am 23d86231: am ae656af7: am bab2b594: Merge "Update locally cached drawables when constant state changes" into lmp-mr1-dev

2014-12-05 21:49:36 +00:00

tests

Merge "Allow compilation with Jack."

2014-12-04 09:26:54 +00:00