| commit | f02af525738583ca42a3cbfea00b868de7281aeb | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Dec 05 17:25:40 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 05 17:25:40 2013 -0800 |
| tree | a0c41b4dde16fb6a129caf1729a7478c9c630b62 | |
| parent | 263212845432865236b9b6ccdca807385603db68 [diff] | |
| parent | 7fc7a07b237e0887f3815822c4551b9968267b37 [diff] |
am 7fc7a07b: Merge commit \'252d9030cd4b2e3e6cf13fa33f328eccedb5e26c\' into HEAD * commit '7fc7a07b237e0887f3815822c4551b9968267b37':