OSDN Git Service

Merge "Explicitly pass old score to updateCapabilities" into nyc-dr1-dev
authorLorenzo Colitti <lorenzo@google.com>
Thu, 15 Sep 2016 15:23:53 +0000 (15:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 15 Sep 2016 15:23:53 +0000 (15:23 +0000)
am: 33a900a91d

Change-Id: I23931e80b52bd9921924d44b44c4df37c971f9e4


Trivial merge