| commit | 45e493e40ca5497cc7c21c3c683145d87bd37364 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Tue Aug 18 12:59:42 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Aug 18 12:59:42 2015 +0000 |
| tree | b5ae8733c1c87200873460e477a6d1b24480dfa5 | |
| parent | 9cebcc5f7992ded7fa686575914830b6554cd6c9 [diff] | |
| parent | dd7c0dd903ef6617d020c13f11b84996addff3c7 [diff] |
Merge "Merge commit '5a289b87' into HEAD" into lmp-dev