John Reck 7ab73f1e98 am e73a54f3: am bf463af2: Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev ...

automerge: 76f24bd

* commit '76f24bde7816dd97ed2375ec41c9817be0330d9f':
  Surface:lockHardwareCanvas

2014-10-21 23:34:46 +00:00

..

androidfw

am 827d00f2: am 3d23d557: am 7f2bc6c7: Merge "More LOCAL_ADDITIONAL_DEPENDENCIES."

2014-10-21 16:16:31 +00:00

common_time

…

hwui

am e73a54f3: am bf463af2: Merge "Surface:lockHardwareCanvas" into lmp-mr1-dev

2014-10-21 23:34:46 +00:00

input

Add cursor flags into SpriteController to suppor async cursor updates.

2014-07-28 22:04:06 +00:00

storage

Installing splits into ASECs!

2014-08-22 16:25:04 -07:00

usb

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

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