tree 7b6b0d35cf0290cadb52dc1489aae311e0e94f90
parent 9be1016b44c229468bd9a215fdbbfb95a8acf2ad
parent f1a1160c68f6c289d3b82573f1a16f9c52aebab4
author Alex Klyubin <klyubin@google.com> 1428530635 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428530635 +0000

am f1a1160c: am c0d6b7cb: Merge "Fix typo"

* commit 'f1a1160c68f6c289d3b82573f1a16f9c52aebab4':
  Fix typo