OSDN Git Service

am c172688d: (-s ours) am c7403258: Reconcile with ics-mr0-release ics-factoryrom...
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 16 Nov 2011 15:42:14 +0000 (07:42 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 Nov 2011 15:42:14 +0000 (07:42 -0800)
commit72a5a247c2a36db7f2c2df9a542c42cb677e82e2
tree5665b392bebc595ee76fd64f6469614b51588efb
parent36d12fc1bd0a758386beb44372178c2144e6b224
parentd0dc0430b4db7249f1408b9ade9f9184ec18d3f7
am c172688d: (-s ours) am c7403258: Reconcile with ics-mr0-release ics-factoryrom-2-release

* commit 'c172688d5e9a1d26e2792297939cbb7bd93acaf2':
  Fix bug in TextLayoutCacheKey handling embedded nulls.
  DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to open an overflow menu under invalid circumstances.