| commit | ac29b5a6746279f156f9471633498f29e39c14ff | [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 | f9995dab0c1193f9c2557cbe3b27ffadb4ec3dcc | |
| parent | 6668bcdc88226c2f36f5ba4084661477e0e517c4 [diff] | |
| parent | b4c0ead90f29f49cf494aa1d39a143b417e62545 [diff] |
am b4c0ead9: (-s ours) Merge commit \'b873a17ce7be0a9771c24999adca6964431728f6\' into HEAD * commit 'b4c0ead90f29f49cf494aa1d39a143b417e62545':