summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-12-03 11:36:46 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-12-03 11:36:46 -0800
commit15c0ba91397c4f4ef32f27e35d83b40c303bff3c (patch)
tree360d2cf9ec65fdc28ea1b5d65a12438ba8ade345
parent7e1820a7224c9b8726c1687924ff81dda20af5cc (diff)
parentafa8348248f9aa7cca59e1c74992fcd7ac6cbd90 (diff)
downloadLauncher2-15c0ba91397c4f4ef32f27e35d83b40c303bff3c.tar.gz
am afa83482: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit 'afa8348248f9aa7cca59e1c74992fcd7ac6cbd90':
0 files changed, 0 insertions, 0 deletions