tree 6e4bb6d057f3c45820fd879ea7f030cac0a21f72
parent 5866c04a6b152aac6dd13e9ebba9a86831a84a29
parent 49937b5c464582a44d119c07f3b71412dbb2051e
author Wale Ogunwale <ogunwale@google.com> 1430272825 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430272825 +0000

am 49937b5c: am b1c9539d: Merge "@hide resizeableActivity attribute and remove from public api" into mnc-dev

* commit '49937b5c464582a44d119c07f3b71412dbb2051e':
  @hide resizeableActivity attribute and remove from public api