tree b8497ded6aaf370feca2299360a4b12c867db928
parent 2ea0c765f978f7f35a63b5482bde7347962f373c
parent 0b1a7c91d580153c1f14085ba142460ff43c1439
author Mike Lockwood <lockwood@android.com> 1300149928 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300149928 -0700

Merge branch 'honeycomb-LTE' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE