diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2012-11-02 07:30:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-02 07:30:27 -0700 |
| commit | cd91c4461d2d3da1b3cc3d8d0f61fc266dbeec0f (patch) | |
| tree | e695f0dfa1dafb3978144842eb29066534d0c003 /include | |
| parent | ea4d950e9d2cfbb06fde1ccb6ddada5adb0a726e (diff) | |
| parent | 8b6ce0a269ba67995766980f5b83937302143e64 (diff) | |
| download | frameworks_av-cd91c4461d2d3da1b3cc3d8d0f61fc266dbeec0f.zip frameworks_av-cd91c4461d2d3da1b3cc3d8d0f61fc266dbeec0f.tar.gz frameworks_av-cd91c4461d2d3da1b3cc3d8d0f61fc266dbeec0f.tar.bz2 | |
am 8b6ce0a2: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '8b6ce0a269ba67995766980f5b83937302143e64':
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions