Fabrice Di Meglio 5412ba1cb9 resolved conflicts for merge of 8794c80d to master ...

Change-Id: I61313a3dd4cd0bcbf04c16dc17996a997b43fe0c

2012-11-30 17:08:26 -08:00

..

java

resolved conflicts for merge of 8794c80d to master

2012-11-30 17:08:26 -08:00

jni

Merge "Use LruCache instead of GenerationCache in libhwui"

2012-11-29 13:58:57 -08:00

res

am 4816f4b4: am 0def7b94: am 849f5188: am 6643ea82: resolved conflicts for merge of 011132a7 to jb-mr1-dev

2012-11-30 10:43:24 -08:00

tests

am 9f43afad: am 68363456: am 7420ab68: Merge "Utility to format human-friendly durations." into jb-mr1.1-dev

2012-11-16 10:37:54 -08:00