tree 75b269ee4a60ccb7cc1b20de2d9f312b1818f9e4
parent 4b6614e5762852e4495a991b5fc833a342f2cb36
parent 1427bb3dc0b4a710ec17b5a065db3980bea70676
author Jason Monk <jmonk@google.com> 1466715733 +0000
committer android-build-merger <android-build-merger@google.com> 1466715733 +0000

Merge \"QS: Hacks to fix bigger problems in TileService binding\" into nyc-dev
am: 1427bb3dc0

Change-Id: I471055cbac21c09d23b60e6dab15bcc1cd1d6208