tree 980fc56fdb90724fa1949eee339b96088415e88e
parent c15d7f63f047149e3fee0f2fc57539fb32856260
parent 03245a8ec46acc7c2b24d3d680ea5b88bd89ce13
author Raphael <raphael@google.com> 1296513176 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296513176 -0800

am 03245a8e: Merge "LayoutLib.Create: support Outer_Inner_Delegate renaming." into honeycomb

* commit '03245a8ec46acc7c2b24d3d680ea5b88bd89ce13':
  LayoutLib.Create: support Outer_Inner_Delegate renaming.