tree 753095d9a0abd312ad82ea0143d1592668beffac
parent 750f91cef9ce9cc5cba76661d921511750758252
parent 4318b9c88cca12485082687658ee3bab5ecd9013
author Ian Pedowitz <ijpedowitz@google.com> 1455871017 +0000
committer android-build-merger <android-build-merger@google.com> 1455871017 +0000

Merge "Revert "Revert "Fix warnings in servicemanager and KeyCharacterMap""" into nyc-dev
am: 4318b9c88c

* commit '4318b9c88cca12485082687658ee3bab5ecd9013':
  Revert "Revert "Fix warnings in servicemanager and KeyCharacterMap""