| commit | 57c33d0d71251d408cf771e5fa861fb1cdecf5f9 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Nov 22 17:40:32 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 22 17:40:32 2013 -0800 |
| tree | cf31cd969679f6f4551448835e4e3d1a3745cfb7 | |
| parent | a6703462926408fa83f41a2cb319e4f51fa7d4ca [diff] | |
| parent | dbccd44a638ae8705a5b14bff8b2dd74abc26045 [diff] |
am dbccd44a: (-s ours) Merge commit \'b873a17ce7be0a9771c24999adca6964431728f6\' into HEAD * commit 'dbccd44a638ae8705a5b14bff8b2dd74abc26045':