diff options
author | Raphael <raphael@google.com> | 2011-12-12 15:39:30 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-12 15:39:30 -0800 |
commit | b2bf2471b1f0b4a76660e63f91a8de84cc643da8 (patch) | |
tree | b1acf75706396a9bddefe4f57e392020cef7c0ca /libs | |
parent | 470d057aedee2f1a8b88a95419f8b1bb42f2120a (diff) | |
parent | ab8d6785dcefa5b2b66f6c042475a0f9f558dd45 (diff) | |
download | frameworks_base-b2bf2471b1f0b4a76660e63f91a8de84cc643da8.zip frameworks_base-b2bf2471b1f0b4a76660e63f91a8de84cc643da8.tar.gz frameworks_base-b2bf2471b1f0b4a76660e63f91a8de84cc643da8.tar.bz2 |
am ab8d6785: (-s ours) am 2ace3b01: Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1
* commit 'ab8d6785dcefa5b2b66f6c042475a0f9f558dd45':
Merge "AAPT fix printf %zd crash on Windows". Do not merge.
Diffstat (limited to 'libs')
0 files changed, 0 insertions, 0 deletions