| commit | cdece9fe651f15d6225a33e7df0bfdd982e8d8fd | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Dec 06 01:43:28 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 06 01:43:28 2013 +0000 |
| tree | 46b6a182d174deace26c5bc5f66ffb4a8b46fd44 | |
| parent | 40b61174547cb932ba3da544e83f6ccf214be3ed [diff] | |
| parent | 5e967f6a202a2184f730bb2e11950acedcb36eb6 [diff] |
am 5e967f6a: am e2d617f5: Merge commit \'2381f06f374ee0cb8bca0edf5388394432b00e6d\' into HEAD * commit '5e967f6a202a2184f730bb2e11950acedcb36eb6':