tree a6a7c3292f563ef390e718a4426a62b8e454d8b0
parent 7cff91ea67f89ca963a822daa1b68674bfc0e587
parent d61cbf9a08733b45a6aecafffffa60da269a3e1e
author Andreas Gampe <agampe@google.com> 1426525382 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426525382 +0000

am d61cbf9a: Merge "Frameworks/base: Fix a constructor"

* commit 'd61cbf9a08733b45a6aecafffffa60da269a3e1e':
  Frameworks/base: Fix a constructor