diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2013-05-28 13:50:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-28 13:50:15 -0700 |
| commit | 88a0abacb1de24000d2e8db8b0132b4afd731225 (patch) | |
| tree | 2eaa6df85571c958d135de3144aa3f0f8af15599 /services | |
| parent | 355daed5e7c29fcf5514ed8e8319ce60128e30b0 (diff) | |
| parent | 30ca8004cf259c5dceab5cec06cab5ae9a17d89b (diff) | |
| download | frameworks_av-88a0abacb1de24000d2e8db8b0132b4afd731225.zip frameworks_av-88a0abacb1de24000d2e8db8b0132b4afd731225.tar.gz frameworks_av-88a0abacb1de24000d2e8db8b0132b4afd731225.tar.bz2 | |
am 30ca8004: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '30ca8004cf259c5dceab5cec06cab5ae9a17d89b':
Diffstat (limited to 'services')
0 files changed, 0 insertions, 0 deletions