summaryrefslogtreecommitdiffstats
path: root/libs/gui
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2012-02-06 13:09:08 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-02-06 13:09:08 -0800
commite75abda25a4a638599b36ba8dc21fe4ddefd61ab (patch)
tree49c5b2f9cdc0625a6cabbfb774ea1e0c5184ecd6 /libs/gui
parent6d41c9a96e085eed31ab8d689e6ca6f01e5e03b2 (diff)
parent6f2f42d52a23de0bd639d5e4957331118ccc47b8 (diff)
downloadframeworks_base-e75abda25a4a638599b36ba8dc21fe4ddefd61ab.zip
frameworks_base-e75abda25a4a638599b36ba8dc21fe4ddefd61ab.tar.gz
frameworks_base-e75abda25a4a638599b36ba8dc21fe4ddefd61ab.tar.bz2
am 6f2f42d5: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
* commit '6f2f42d52a23de0bd639d5e4957331118ccc47b8':
Diffstat (limited to 'libs/gui')
0 files changed, 0 insertions, 0 deletions