tree 46886085e46f83608467461a69358f6208916bd2
parent 0486d03dc0c843f31852afc2812c934f10aeb21e
parent 94d7494a2b98b723710eee9d3398e99e64b7688b
author tturney <tturney@google.com> 1430441400 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430441400 +0000

am 94d7494a: am 56c58a2e: Merge "Fix typo. bug: b/20610710" into mnc-dev

* commit '94d7494a2b98b723710eee9d3398e99e64b7688b':
  Fix typo. bug: b/20610710