tree ce5010decf66503cb9fdbb1b7dde9ccb0d2ae640
parent d6d8745bb2b872defafa824ddebcf1e35ea4c320
parent 1ae5fbb18713d26c9e51f7f16d9af5d7f1def576
author Jason Monk <jmonk@google.com> 1466716352 +0000
committer android-build-merger <android-build-merger@google.com> 1466716352 +0000

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

Change-Id: I07ea15c56048becb7cba5f27bb7037ae8e10aea2