am: c87cbff6 -s ours * commit 'c87cbff6': docs: Fixed incorrect "format result" for Formatter.java. Change-Id: I50f9151a3e2399835f318100691d14cdd81d2e48