tree b8497ded6aaf370feca2299360a4b12c867db928
parent 019ce758bcd8041e426735a3c247d2341b5afaeb
parent 0b73c16133f442294e5b766f756adbb859db2c14
author Mike Lockwood <lockwood@android.com> 1300150142 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300150142 -0700

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

* commit '5da789a6735a9e06e6cd6b72b09c7de9bf7715a8':