tree b1a733f16d8362f2c8562a26b598fe642c5f0c71
parent 07cd3f3f018a32860e183ccdf9253dcc37c630bb
parent 6fea1665a91dafa49b78d1c92c53bb0fa1736020
author Dianne Hackborn <hackbod@google.com> 1362616844 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1362616844 +0000

am 6fea1665: am 1ab64b81: Merge "Add new sample code for writing a ViewGroup." into jb-mr2-dev

* commit '6fea1665a91dafa49b78d1c92c53bb0fa1736020':
  Add new sample code for writing a ViewGroup.