Dianne Hackborn df0ddff7e1 am 8b7c81c7: am 3c78702d: Merge "Maybe fix issue #7146119: exception in FragmentManager" into jb-mr1-dev ...

* commit '8b7c81c782947cf2614e246daa91a0b8a9fa1f0d':
  Maybe fix issue #7146119: exception in FragmentManager

2012-09-13 14:04:03 -07:00

..

java

am 8b7c81c7: am 3c78702d: Merge "Maybe fix issue #7146119: exception in FragmentManager" into jb-mr1-dev

2012-09-13 14:04:03 -07:00

jni

am fde57726: am eb1f5349: Merge "Fix for b7155617 race condition in TextLayoutCache.cpp" into jb-mr1-dev

2012-09-13 03:21:36 -07:00

res

am dc663fa5: am 39de2b0e: Merge "Music in keyguard improvements - fix overscroll issue with workaround described in bug 7137941 - ignore noisy signals from music player that sometimes hide it" into jb-mr1-dev

2012-09-13 03:22:27 -07:00

tests

Merge "Update airplane-mode manipulation for the new Settings namespace" into jb-mr1-dev

2012-09-10 17:16:17 -07:00