tree 2fcc7885ed176016bd7990436705b5936354fdaa
parent ee1f24ff2985a32b473244cc464b3ca7854de189
parent 059ba9814bb07aeebd8bf697fc05ff833c63033b
author John Reck <jreck@google.com> 1426518977 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426518977 +0000

am 059ba981: am 386dcbdd: Merge "Frameworks/base: Fix missing cast"

* commit '059ba9814bb07aeebd8bf697fc05ff833c63033b':
  Frameworks/base: Fix missing cast