| commit | e05713d93b1a7a1cb0cd697947846ac3ac0b50cd | [log] [tgz] |
|---|---|---|
| author | Jerry Zhang <zhangjerry@google.com> | Thu Nov 17 18:30:13 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Nov 17 18:30:16 2016 +0000 |
| tree | e46a288b7513471fccb675c6c77d0ff490043243 | |
| parent | 6acb4efca3c9575c88828fd215e1aa09372f18be [diff] | |
| parent | bb2965d2393f3edf70a4f48b91dc4b40c23b70bf [diff] |
Merge "Merge commit '6bb98d85a0a0790ed2b600f4a165ab79ad536f04' into manual_merge_6bb98d8"