commit | 803b87aa75377af69ab95df395f6bffcefa55742 | [log] [tgz] |
---|---|---|
author | John Reck <jreck@google.com> | Wed May 30 10:37:16 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 30 10:37:16 2012 -0700 |
tree | 7b93f8ac1128782bcfb233c664a06228a4837c31 | |
parent | 55611c288c12441c9c2fc04fed24dd556d671e16 [diff] | |
parent | 0c5933fe14a9c028055139375fc177221bc4ee82 [diff] |
am 0c5933fe: am 244cdfa6: Merge "Prevent the monkies with a sledgehammer" into jb-dev * commit '0c5933fe14a9c028055139375fc177221bc4ee82': Prevent the monkies with a sledgehammer