Ricardo Cervera 23a6d889aa am 1e59b338: am 08314642: am 90312d80: am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev ...

* commit '1e59b338e6d1a270947908e53cefd088e2e38fb3':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256

2015-01-16 20:06:53 +00:00

..

java

am 1e59b338: am 08314642: am 90312d80: am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev

2015-01-16 20:06:53 +00:00

jni

Merge "Allow AUDIO_FORMAT_PCM_8_BIT static AudioTrack buffers"

2015-01-16 00:21:17 +00:00

res

am 78dfb182: am dbe54533: am 77e1f7a2: Merge "Ensure scroll assets are drawn with correct opacity" into lmp-mr1-dev

2015-01-16 00:05:51 +00:00

tests

am b3f73dc5: am b55011e4: am f9c04f17: Merge "Removing HttpResponseCacheTest"

2015-01-16 10:35:30 +00:00