Derek Sollenberger a30ed30b75 resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp ...

Change-Id: Iebde13c41a2adf4e693d87e808cb0659f913e4e6

2011-07-29 14:16:18 -04:00

..

android_runtime

…

binder

…

camera

…

diskusage

…

drm

DO NOT MERGE

2011-05-13 15:09:24 -07:00

gui

resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp

2011-07-29 14:16:18 -04:00

media

am 5a6c3d49: am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2

2011-05-18 09:30:01 -07:00

pim

…

private

…

storage

…

surfaceflinger

…

tts

…

ui

Tweaks for forward-compatibility

2011-06-18 09:42:04 -07:00

utils

DO NOT MERGE. may fix build on some version of gcc

2011-07-27 11:31:57 -07:00