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