| commit | a6b15ae4ad9dc79a2b4bb3418d7b7e7b7aa8e654 | [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 | a782851d37c175d27b67705165c5e82df4d488ac | |
| parent | f135d133db23a674e966bb8c76b12b43b045848e [diff] | |
| parent | f799828a66661d4409647c419aec62be654a325b [diff] |
am dbccd44a: (-s ours) Merge commit \'b873a17ce7be0a9771c24999adca6964431728f6\' into HEAD * commit 'dbccd44a638ae8705a5b14bff8b2dd74abc26045':