tree 9cd5cacb201b03b6312ba0ac769f7df5170c3817
parent a4b8a2dd893ede029a605e2c56434e9e1d98b23a
parent 97cbc0ad3bc17f1f67d99054d1e5b36cf7107888
author Adrian Roos <roosa@google.com> 1464827181 +0000
committer android-build-merger <android-build-merger@google.com> 1464827181 +0000

Merge "Merge "Fix DirectReply bug when reapply fails" into nyc-dev am: 6510bdeada am: 06a49b1e93" into nyc-mr1-dev-plus-aosp
am: 97cbc0ad3b

* commit '97cbc0ad3bc17f1f67d99054d1e5b36cf7107888':

Change-Id: Id339b6a6af173e8e99be72292033fc94b3752f9e