tree dfb962c866a57c131d16f62a1783603ee5c8b91d
parent 04e9d830b0c549587c9867778a5d0069373c0853
parent 489bafbb4ba53fd104c898975cf48c8815a1cb59
author Makoto Onuki <omakoto@google.com> 1466097042 +0000
committer android-build-merger <android-build-merger@google.com> 1466097042 +0000

Merge \"Shortcut: Reset throttling upon inline reply\" into nyc-mr1-dev
am: 489bafbb4b

Change-Id: I5c8dc7f3c1e5860ea870d88b2ff7fc2a86a4ba39