| commit | ef410b5ce8208d7944282cb7a8c4843a75cea2e4 | [log] [tgz] |
|---|---|---|
| author | Billy Hewlett <billyh@google.com> | Mon Aug 20 13:15:16 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 20 13:15:16 2012 -0700 |
| tree | 691349aca0fa7a72ace5d0a9670bf1c636f1a5cb | |
| parent | 511a6029a63321ead4134898fb768381c771ed10 [diff] | |
| parent | 725b3e03acb91dc69296554932624b36612bd189 [diff] |
am 725b3e03: (-s ours) DO NOT MERGE Han Preference * commit '725b3e03acb91dc69296554932624b36612bd189': DO NOT MERGE Han Preference