tree f03503c967b8db75837f9840c6d72416dcb09cc8
parent d980f010f057097062eacd7413dfe3b90f358e9b
parent 47c41d9ea2255d6f212232174d1c0270c0584c90
author Yorke Lee <yorkelee@google.com> 1386283509 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386283509 +0000

am 47c41d9e: (-s ours) am 7b1dd7b4: am c8f977ed: Merge "Improve fragment handling" into klp-dev

* commit '47c41d9ea2255d6f212232174d1c0270c0584c90':