commit | cddfb9b7c084a67d12df9dcf8e94fff7e02831f1 | [log] [tgz] |
---|---|---|
author | RoboErik <epastern@google.com> | Fri Nov 14 00:45:03 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 14 00:45:03 2014 +0000 |
tree | d072ff21d4a8605c1aed0fe4ee8207317cd8091d | |
parent | 3733efc8c15c0253cb26f99ef6951a2495bbd3e1 [diff] | |
parent | 0f17d95e6fc0fb49fbaa87dbd3f04662e6d7e9cc [diff] |
am 0f17d95e: am 9e070715: am f338fcba: Merge "Use the suggested stream if it\'s currently active" into lmp-mr1-dev * commit '0f17d95e6fc0fb49fbaa87dbd3f04662e6d7e9cc': Use the suggested stream if it's currently active