summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorTom O'Neill <tomo@google.com>2014-09-08 19:49:04 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-08 19:49:04 +0000
commit784a01f91668f3da7bb9e9747f32ac7f960bab4b (patch)
treef3d83a87b64b48e6e625163f165d605ecfab945a /packages
parent8828537f61979a90bf8a48d041cecab3e8b7b598 (diff)
parent4d5f69f20e636523d69574d2f2073c998226eb8a (diff)
downloadframeworks_base-784a01f91668f3da7bb9e9747f32ac7f960bab4b.zip
frameworks_base-784a01f91668f3da7bb9e9747f32ac7f960bab4b.tar.gz
frameworks_base-784a01f91668f3da7bb9e9747f32ac7f960bab4b.tar.bz2
am ac4e15e7: am 8fff150b: Merge "Fix a STOPSHIP" into lmp-dev
* commit 'ac4e15e74d02cb75bac21e6c406e6b270e08a810': Fix a STOPSHIP
Diffstat (limited to 'packages')
0 files changed, 0 insertions, 0 deletions