John Reck d67bb5015f am eb2dcc79: Merge "Don\'t preload textures for AssetAtlas" into lmp-mr1-dev ...

automerge: e4a6ed9

* commit 'e4a6ed9d6d8721c9fad018b0d43dfe7daf4b24e7':
  Don't preload textures for AssetAtlas

2014-12-11 01:25:54 +00:00

..

androidfw

am 740acf21: am c7801877: Merge "Fix issue where non-resource attributes would cause obtainStyleAttributes to fail" into lmp-mr1-dev

2014-12-11 00:07:02 +00:00

common_time

Update calls to IInterface::asBinder()

2014-11-17 10:05:31 -08:00

hwui

am eb2dcc79: Merge "Don\'t preload textures for AssetAtlas" into lmp-mr1-dev

2014-12-11 01:25:54 +00:00

input

Frameworks/base: Wall Werror in libs/input

2014-11-10 15:55:11 -08:00

storage

Update calls to IInterface::asBinder()

2014-11-17 10:05:31 -08:00

usb

resolved conflicts for merge of 1a4527ce to lmp-mr1-dev-plus-aosp

2014-09-19 16:13:49 -07:00