Dianne Hackborn 460797b398 am 84adc43a: Merge "Fix issue #18706195: Improve label names of memory types" into lmp-mr1-dev automerge: 0f050ea ...

automerge: b56e98d

* commit 'b56e98da8b0486485a57803e5ef9e9333a510641':
  Fix issue #18706195: Improve label names of memory types

2014-12-11 10:18:41 +00:00

..

java

am 84adc43a: Merge "Fix issue #18706195: Improve label names of memory types" into lmp-mr1-dev automerge: 0f050ea

2014-12-11 10:18:41 +00:00

jni

am 09378975: resolved conflicts for merge of 5196dd04 to lmp-mr1-dev-plus-aosp

2014-12-10 21:57:35 +00:00

res

am 1259ab3a: am 3d517a70: am 62b780e8: Avoid creating futures for drawables with no constant state

2014-12-11 01:38:38 +00:00

tests

Merge "Allow compilation with Jack."

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