tree 90df685fd73bfec137f3e5256c91f46766aed839
parent b3d69bf95eece256c05aea029a7f6ebf3f0fcd26
parent 0ccef4d00357275f3a492e10f4e88aaf4d9deec6
author Alan Viverette <alanv@google.com> 1378424439 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378424439 -0700

am 0ccef4d0: Merge "Apply implicit parent dependency when adding to PreferenceGroup" into klp-dev

* commit '0ccef4d00357275f3a492e10f4e88aaf4d9deec6':
  Apply implicit parent dependency when adding to PreferenceGroup