diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2012-07-31 14:51:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-07-31 14:51:16 -0700 |
| commit | 9dcfff205e05c62e97b5aabedaa8c30309b99738 (patch) | |
| tree | f7d35c60f4ccaf920d7ce30454caabcd0b3f62b8 /core | |
| parent | bccda0aee3fc0078d2e094b4fb9c6c2abab1b728 (diff) | |
| parent | ca4117ca387fbcd8a9e18070e0a73c2eae4baa22 (diff) | |
| download | frameworks_base-9dcfff205e05c62e97b5aabedaa8c30309b99738.zip frameworks_base-9dcfff205e05c62e97b5aabedaa8c30309b99738.tar.gz frameworks_base-9dcfff205e05c62e97b5aabedaa8c30309b99738.tar.bz2 | |
am ca4117ca: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit 'ca4117ca387fbcd8a9e18070e0a73c2eae4baa22':
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions