diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2013-06-13 08:25:37 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-13 08:25:37 -0700 |
commit | bb398a6394dfddc69559cbc62da24571af976fff (patch) | |
tree | 79f19f80ebb7978e9bab16e1d9b835849c735592 | |
parent | 51ee28d24c0d3000124bd435657dbaf68c65a049 (diff) | |
parent | a45398078e4f798a34310a2d5213e07eefb14238 (diff) | |
download | frameworks_av-bb398a6394dfddc69559cbc62da24571af976fff.zip frameworks_av-bb398a6394dfddc69559cbc62da24571af976fff.tar.gz frameworks_av-bb398a6394dfddc69559cbc62da24571af976fff.tar.bz2 |
am a4539807: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit 'a45398078e4f798a34310a2d5213e07eefb14238':
0 files changed, 0 insertions, 0 deletions