| commit | 2c3004bf9e710e4e6e758c3b9a6950616a087546 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Nov 22 19:31:23 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 22 19:31:23 2013 -0800 |
| tree | ad145a8f6e4997f29b772009ebe4c7f4a5dfa401 | |
| parent | 3b49b08e33726ee9056f50d1f6bbb23210482f01 [diff] | |
| parent | ac29b5a6746279f156f9471633498f29e39c14ff [diff] |
am ac29b5a6: am b4c0ead9: (-s ours) Merge commit \'b873a17ce7be0a9771c24999adca6964431728f6\' into HEAD * commit 'ac29b5a6746279f156f9471633498f29e39c14ff':