commit | 96857412866e5cfbd7bc12f520f4495cdf99e0a8 | [log] [tgz] |
---|---|---|
author | Dimitry Ivanov <dimitry@google.com> | Fri Dec 11 22:07:08 2015 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Dec 11 22:07:08 2015 +0000 |
tree | 68d0a601981507b38a1fbcfde6e20c8247c0bbb7 | |
parent | 3e381723658e8a0bce24071b53f57bf22af76a1e [diff] | |
parent | a5fcdc2ab2efcda42dae657ff0a829e92b9b7e7c [diff] |
Merge "Merge commit '1b6dd57975aefbb28d66f0e58ecdf4abe56648b4' into manual_merge_1b6dd57975"