| commit | 59d433f5ead2bda003752be6f99d96e599cf2982 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Mon Mar 30 18:42:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 30 18:42:55 2015 +0000 |
| tree | 1367199cf62182c983a1e24758d382efb231dfdc | |
| parent | 314bc8c0e6348ecee3f2f6411d8240d0cba5f79f [diff] | |
| parent | cbdec383f28a9b11795b0fceab58c72cfac769ff [diff] |
am 68e2a200: (-s ours) am b1c0b3b1: (-s ours) am cbdec383: (-s ours) DO NOT MERGE ANYWHERE. * commit '68e2a200f23ef2a89616aa0753a49a878fd3c2e3': DO NOT MERGE ANYWHERE.