am 0371fd02: (-s ours) Reconcile with jb-mr2-release - do not merge

Browse Source

* commit '0371fd021f2f445b4041dc38f91ec25f10253455':
  am 7212ff29: am 20e154f1: Merge "Second try at adding a compatibility symbol for the MemoryBase constructor."
  size IMemoryHeap properly for screenshots

...

This commit is contained in:

The Android Open Source Project 2013-03-20 16:46:48 +00:00 committed by Android Git Automerger

parent d5db7a1826 0371fd021f

commit 4e9d899a03

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available