tree 10a3ce3f8977e7159435723b27ea392a6d0bfcbf
parent f6768bac864cdf9ed99b088dc88da6b38df6911e
parent 7d3bd06d2928942c6eedbcf5e9437b43a1268a6d
author Natalie Masse <nmasse@google.com> 1415049351 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415049351 +0000

am 7d3bd06d: am 1e5bb861: Link and typo fixed automerge: bcf9ced automerge: 9f6ea58

* commit '7d3bd06d2928942c6eedbcf5e9437b43a1268a6d':