| commit | c4663b24cd7e74fd4a8942e1628fd09a0cd72156 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Mon Jul 08 12:43:09 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 08 12:43:09 2013 -0700 |
| tree | 9c991c38d44b1c1f21e8b66d3bc51dc8fa1d3be7 | |
| parent | 5c586990c74e6c4f88d7d18018953f8cd7607e61 [diff] | |
| parent | bd6f9b609efe30525e4a6f612e0a5aa61ceae224 [diff] |
am bd6f9b60: am 5288ef70: (-s ours) resolved conflicts for merge of 1cec2593 to jb-mr1-dev-plus-aosp * commit 'bd6f9b609efe30525e4a6f612e0a5aa61ceae224': Values in ZIP files are unsigned.