commit | 768d7a9aa8a80099e566a858b44041d6219d213d | [log] [tgz] |
---|---|---|
author | Yabin Cui <yabinc@google.com> | Wed Apr 27 00:08:06 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Apr 27 00:08:06 2016 +0000 |
tree | f789e588d1b3bfd8e844feb0897822ed587db3ef | |
parent | 4ef1149423b2dc344e49eddabc5fb38e085dc00c [diff] | |
parent | ccc1e3c635c64d4ed8bdd2ba6bccb3dd8eadf7c8 [diff] |
resolve merge conflicts of 550ad20d to nyc-dev-plus-aosp am: 6b9de91 * commit '6b9de913cc2de427901dcadeb2a12a4e75d67986': Fix kick_transport test. Change-Id: I775dbd0b7f6c0e16bc88bc08a1955b6ccbb61c40