tree 7b3d3f5b7643025d79244881baee98c1ee8af248
parent b1c9c24aba8aaec6047d7be89e9db64a12a98da3
parent 319d596af75a8451f2acc97f5279dc14cde8cc0e
author Scott Main <smain@google.com> 1304026469 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1304026469 -0700

am c932a56a: am d7f739b1: am 114ba198: am c59e80c4: Merge "docs: fix for Misdirected link in topic Declaring Layout bug 4257430" into honeycomb

* commit 'c932a56ac84d680fd8f38c913c7e76105cfc0597':
  docs: fix for Misdirected link in topic Declaring Layout bug 4257430