| commit | 2ad37646fe84189e35602e99d06586e0abb202dc | [log] [tgz] |
|---|---|---|
| author | Yin-Chia Yeh <yinchiayeh@google.com> | Thu Sep 03 22:06:01 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 03 22:06:01 2015 +0000 |
| tree | 59a14b8efd70f6a0779ef59968d8a95ed4961a0d | |
| parent | d5ca7e98a280e8ebd9964a814c27808afc8a8bdf [diff] | |
| parent | 6d3aac03c5db556184edbaf395c315bf60b6f8cf [diff] |
am 6d3aac03: (-s ours) Merge "DO NOT MERGE. Backport test fixes from lmp-mr1-dev" into lmp-sprout-dev * commit '6d3aac03c5db556184edbaf395c315bf60b6f8cf': DO NOT MERGE. Backport test fixes from lmp-mr1-dev