tree 7f6a78973246f9c1959789dc4994f441a6ae69f0
parent d265d3674937651d23a0252e6aad0ee09b02492a
parent d383ac1570b553d68ed399c74b73bad1498d78f6
author Elliott Hughes <enh@google.com> 1359411114 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1359411114 -0800

am d383ac15: am a0151cbf: Merge "Unit tests for formatting code, fix %%."

# Via Android Git Automerger (1) and others
* commit 'd383ac1570b553d68ed399c74b73bad1498d78f6':
  Unit tests for formatting code, fix %%.