tree 120447c7f0c3ce10371f60b84682de84b2008a0d
parent 3c4ca688ceeb26aa21b6b061d46de37fbe1f9107
parent 1eca7d66ee3da87c622259544794b8fe998cdb92
author Andreas Gampe <agampe@google.com> 1426722635 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426722635 +0000

am 1eca7d66: am 2a247b36: Merge "Frameworks/base: Fix visibility flag in Editor"

* commit '1eca7d66ee3da87c622259544794b8fe998cdb92':
  Frameworks/base: Fix visibility flag in Editor